@@ -8,6 +8,9 @@ from pathlib import Path
88 from tempfile import TemporaryDirectory
99 from typing import Any
1010
11+
12+_FINAL_STOP_REASONS = frozenset({"stop", "error", "aborted"})
13+
1114 from harbor.agents.installed.base import BaseInstalledAgent, with_prompt_template
1215 from harbor.environments.base import BaseEnvironment
1316 from harbor.models.agent.context import AgentContext
@@ -20,12 +23,21 @@ class LocalMiniCoderAgent(BaseInstalledAgent):
2023 _JSON_LOG_FILENAME = "mini-coder.json"
2124 _STDERR_LOG_FILENAME = "mini-coder.stderr.txt"
2225 _PACKAGE_PATHS = ("bin/mc.ts", "src")
23- _PACKAGE_MANIFEST_KEYS = ("name", "version", "type", "bin", "dependencies")
26+ _PACKAGE_MANIFEST_KEYS = (
27+ "name",
28+ "version",
29+ "type",
30+ "bin",
31+ "dependencies",
32+ "packageManager",
33+ )
2434
2535 def __init__(self, *args, version: str = "local", **kwargs):
2636 super().__init__(*args, version=version, **kwargs)
2737 self._host_repo_root = Path(__file__).resolve().parents[1]
28- self._host_auth_path = Path.home() / ".config" / "mini-coder" / "auth.json"
38+ host_config_dir = Path.home() / ".config" / "mini-coder"
39+ self._host_auth_path = host_config_dir / "auth.json"
40+ self._host_settings_path = host_config_dir / "settings.json"
2941
3042 @staticmethod
3143 def name() -> str:
@@ -74,12 +86,14 @@ class LocalMiniCoderAgent(BaseInstalledAgent):
7486 self._merge_context_metadata(context, metadata)
7587 return
7688
77- if not isinstance(result, dict):
78- metadata["parse_error"] = "mini-coder JSON log was not an object"
89+ parsed_result = self._extract_result_from_json_log(result)
90+ metadata.update(parsed_result["metadata"])
91+ result_message = parsed_result.get("message")
92+ if not isinstance(result_message, dict):
7993 self._merge_context_metadata(context, metadata)
8094 return
8195
82- usage = result.get("usage")
96+ usage = result_message.get("usage")
8397 usage_data = usage if isinstance(usage, dict) else {}
8498
8599 context.n_input_tokens = self._optional_int(usage_data.get("input"))
@@ -102,7 +116,7 @@ class LocalMiniCoderAgent(BaseInstalledAgent):
102116 ("stopReason", "stop_reason"),
103117 ("errorMessage", "error_message"),
104118 ):
105- value = result.get(source_key)
119+ value = result_message.get(source_key)
106120 if isinstance(value, str) and value:
107121 metadata[metadata_key] = value
108122
@@ -111,6 +125,55 @@ class LocalMiniCoderAgent(BaseInstalledAgent):
111125
112126 self._merge_context_metadata(context, metadata)
113127
128+ @classmethod
129+ def _extract_result_from_json_log(
130+ cls, result: Any
131+ ) -> dict[str, dict[str, Any] | dict[str, Any] | None]:
132+ if isinstance(result, dict):
133+ return {"message": result, "metadata": {"json_log_shape": "object"}}
134+
135+ if not isinstance(result, list):
136+ return {
137+ "message": None,
138+ "metadata": {
139+ "json_log_shape": type(result).__name__,
140+ "parse_error": "mini-coder JSON log was neither an object nor an array",
141+ },
142+ }
143+
144+ assistant_messages = [
145+ item
146+ for item in result
147+ if isinstance(item, dict) and item.get("role") == "assistant"
148+ ]
149+ if not assistant_messages:
150+ return {
151+ "message": None,
152+ "metadata": {
153+ "json_log_shape": "array",
154+ "event_count": len(result),
155+ "assistant_message_count": 0,
156+ "parse_error": "mini-coder JSON log array had no assistant messages",
157+ },
158+ }
159+
160+ final_message = next(
161+ (
162+ item
163+ for item in reversed(assistant_messages)
164+ if item.get("stopReason") in _FINAL_STOP_REASONS
165+ ),
166+ assistant_messages[-1],
167+ )
168+ return {
169+ "message": final_message,
170+ "metadata": {
171+ "json_log_shape": "array",
172+ "event_count": len(result),
173+ "assistant_message_count": len(assistant_messages),
174+ },
175+ }
176+
114177 @staticmethod
115178 def _optional_int(value: Any) -> int | None:
116179 if isinstance(value, bool):
@@ -246,6 +309,24 @@ class LocalMiniCoderAgent(BaseInstalledAgent):
246309
247310 return package_manifest
248311
312+ @staticmethod
313+ def _pinned_bun_version(package_manager: Any) -> str | None:
314+ if not isinstance(package_manager, str):
315+ return None
316+ tool_name, _, version = package_manager.partition("@")
317+ if tool_name != "bun" or not version:
318+ return None
319+ if any(not part.isdigit() for part in version.split(".")):
320+ return None
321+ return version
322+
323+ def _expected_bun_version(self) -> str | None:
324+ manifest_path = self._host_repo_root / "package.json"
325+ source_manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
326+ if not isinstance(source_manifest, dict):
327+ return None
328+ return self._pinned_bun_version(source_manifest.get("packageManager"))
329+
249330 async def _install_system_dependencies(self, environment: BaseEnvironment) -> None:
250331 await self.exec_as_root(
251332 environment,
@@ -262,11 +343,35 @@ class LocalMiniCoderAgent(BaseInstalledAgent):
262343 )
263344
264345 async def _install_bun(self, environment: BaseEnvironment) -> None:
346+ expected_version = self._expected_bun_version()
347+ install_command = "curl -fsSL https://bun.sh/install | bash"
348+ if expected_version is not None:
349+ install_command = (
350+ f"curl -fsSL https://bun.sh/install | bash -s -- bun-v{expected_version}"
351+ )
352+ await self.exec_as_agent(
353+ environment,
354+ command=(
355+ f"expected_version={shlex.quote(expected_version)}; "
356+ "current_version=''; "
357+ "if command -v bun >/dev/null 2>&1; then "
358+ "current_version=$(bun --version 2>/dev/null || true); "
359+ "fi; "
360+ "if [ -z \"$current_version\" ] || [ \"$current_version\" != \"$expected_version\" ]; then "
361+ f"{install_command}; "
362+ "fi; "
363+ "export PATH=\"$HOME/.bun/bin:$PATH\"; "
364+ "test -x \"$(command -v bun)\" && "
365+ "[ \"$(bun --version)\" = \"$expected_version\" ]"
366+ ),
367+ )
368+ return
369+
265370 await self.exec_as_agent(
266371 environment,
267372 command=(
268373 "if ! command -v bun >/dev/null 2>&1; then "
269- "curl -fsSL https://bun.sh/install | bash; fi; "
374+ f"{install_command}; fi; "
270375 "export PATH=\"$HOME/.bun/bin:$PATH\"; "
271376 "test -x \"$(command -v bun)\""
272377 ),
@@ -284,32 +389,76 @@ class LocalMiniCoderAgent(BaseInstalledAgent):
284389 ),
285390 )
286391
287- async def _container_config_dir(self, environment: BaseEnvironment) -> str:
392+ async def _container_home(self, environment: BaseEnvironment) -> str:
288393 result = await self.exec_as_agent(environment, command='printf %s "$HOME"')
289394 home_dir = (result.stdout or "").strip()
290395 if not home_dir:
291396 raise RuntimeError("Failed to determine the agent home directory")
397+ return home_dir
292398
399+ async def _container_config_dir(self, environment: BaseEnvironment, home_dir: str) -> str:
293400 config_dir = f"{home_dir}/.config/mini-coder"
294401 await self.exec_as_agent(
295- environment, command=f"mkdir -p {shlex.quote(config_dir)}"
402+ environment,
403+ command=(
404+ f"export HOME={shlex.quote(home_dir)}; "
405+ f"mkdir -p {shlex.quote(config_dir)}"
406+ ),
296407 )
297408 return config_dir
298409
299- async def _upload_host_auth(
300- self, environment: BaseEnvironment, config_dir: str
410+ async def _upload_host_config_file(
411+ self,
412+ environment: BaseEnvironment,
413+ host_path: Path,
414+ container_tmp_path: str,
415+ target_path: str,
416+ *,
417+ required: bool,
301418 ) -> None:
302- tmp_auth_path = "/tmp/mini-coder-auth.json"
303- auth_target = f"{config_dir}/auth.json"
304- await environment.upload_file(self._host_auth_path, tmp_auth_path)
305- await self.exec_as_root(environment, command=f"chmod 644 {tmp_auth_path}")
419+ if not host_path.is_file():
420+ if required:
421+ raise FileNotFoundError(
422+ f"Missing mini-coder config file required for Harbor: {host_path}"
423+ )
424+ return
425+
426+ await environment.upload_file(host_path, container_tmp_path)
427+ await self.exec_as_root(
428+ environment, command=f"chmod 644 {shlex.quote(container_tmp_path)}"
429+ )
306430 await self.exec_as_agent(
307431 environment,
308432 command=(
309- f"cp {shlex.quote(tmp_auth_path)} {shlex.quote(auth_target)} && "
310- f"chmod 600 {shlex.quote(auth_target)}"
433+ f"cp {shlex.quote(container_tmp_path)} {shlex.quote(target_path)} && "
434+ f"chmod 600 {shlex.quote(target_path)}"
311435 ),
312436 )
437+ await self.exec_as_root(
438+ environment, command=f"rm -f {shlex.quote(container_tmp_path)}"
439+ )
440+
441+ async def _upload_host_auth(
442+ self, environment: BaseEnvironment, config_dir: str
443+ ) -> None:
444+ await self._upload_host_config_file(
445+ environment,
446+ self._host_auth_path,
447+ "/tmp/mini-coder-auth.json",
448+ f"{config_dir}/auth.json",
449+ required=True,
450+ )
451+
452+ async def _upload_host_settings(
453+ self, environment: BaseEnvironment, config_dir: str
454+ ) -> None:
455+ await self._upload_host_config_file(
456+ environment,
457+ self._host_settings_path,
458+ "/tmp/mini-coder-settings.json",
459+ f"{config_dir}/settings.json",
460+ required=False,
461+ )
313462
314463 @with_prompt_template
315464 async def run(
@@ -320,8 +469,10 @@ class LocalMiniCoderAgent(BaseInstalledAgent):
320469 ) -> None:
321470 del context
322471 self._require_host_auth()
323- config_dir = await self._container_config_dir(environment)
472+ home_dir = await self._container_home(environment)
473+ config_dir = await self._container_config_dir(environment, home_dir)
324474 await self._upload_host_auth(environment, config_dir)
475+ await self._upload_host_settings(environment, config_dir)
325476
326477 stdout_path = (
327478 EnvironmentPaths.agent_dir / self._JSON_LOG_FILENAME
@@ -329,11 +480,13 @@ class LocalMiniCoderAgent(BaseInstalledAgent):
329480 stderr_path = (
330481 EnvironmentPaths.agent_dir / self._STDERR_LOG_FILENAME
331482 ).as_posix()
483+ mc_path = f"{home_dir}/.bun/bin/mc"
332484 await self.exec_as_agent(
333485 environment,
334486 command=(
335- "export PATH=\"$HOME/.bun/bin:$PATH\"; "
336- f"mc --json -p {shlex.quote(instruction)} </dev/null "
487+ f"export HOME={shlex.quote(home_dir)}; "
488+ f"export PATH={shlex.quote(f'{home_dir}/.bun/bin')}:$PATH; "
489+ f"{shlex.quote(mc_path)} --json -p {shlex.quote(instruction)} </dev/null "
337490 f">{shlex.quote(stdout_path)} "
338491 f"2>{shlex.quote(stderr_path)}"
339492 ),