@geminixiang/mikan 1.0.0-beta.2 → 1.0.0-beta.21

package/dist/commands/new.js

@@ -1,6 +1,7 @@
+import { slashForms } from "./manifest.js";
 import { matchCommand } from "./parse.js";
 import { formatCommandSummary, replyDiagnosticWithContext } from "./utils.js";
-const NEW_COMMANDS = ["/new", "/pi-new"];
+const NEW_COMMANDS = slashForms("new");
 export class NewCommandHandler {
     async tryHandle(context) {
         if (!matchCommand(context.commandText, NEW_COMMANDS))

package/dist/commands/new.js.map

@@ -1 +1 @@
-{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAE9E,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,SAAS,CAAU,CAAC;AAElD,MAAM,OAAO,iBAAiB;IAC5B,KAAK,CAAC,SAAS,CAAC,OAAuB;QACrC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC;YAAE,OAAO,KAAK,CAAC;QAEnE,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;YACjC,MAAM,0BAA0B,CAC9B,OAAO,CAAC,SAAS,EACjB,oBAAoB,CAAC,aAAa,EAAE;gBAClC,4CAA4C;aAC7C,CAAC,EACF,EAAE,KAAK,EAAE,OAAO,EAAE,CACnB,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC9B,MAAM,0BAA0B,CAC9B,OAAO,CAAC,SAAS,EACjB,oBAAoB,CAAC,aAAa,EAAE;gBAClC,wDAAwD;gBACxD,yBAAyB;aAC1B,CAAC,EACF,EAAE,KAAK,EAAE,OAAO,EAAE,CACnB,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAC7C,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,GAAG,CACZ,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;CACF","sourcesContent":["import { matchCommand } from \"./parse.js\";\nimport type { CommandContext, CommandHandler } from \"./types.js\";\nimport { formatCommandSummary, replyDiagnosticWithContext } from \"./utils.js\";\n\nconst NEW_COMMANDS = [\"/new\", \"/pi-new\"] as const;\n\nexport class NewCommandHandler implements CommandHandler {\n  async tryHandle(context: CommandContext): Promise<boolean> {\n    if (!matchCommand(context.commandText, NEW_COMMANDS)) return false;\n\n    if (!context.privateConversation) {\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"New Session\", [\n          \"為了避免誤清除共享上下文，`/new` 目前只能在與機器人的私訊 / DM 中使用。\",\n        ]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    if (!context.services.runtime) {\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"New Session\", [\n          \"New command is not configured correctly on the server.\",\n          \"Please try again later.\",\n        ]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    await context.services.runtime.handleNewCommand(\n      context.sessionKey,\n      context.conversationId,\n      context.bot,\n    );\n    return true;\n  }\n}\n"]}
+{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAE9E,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;AAEvC,MAAM,OAAO,iBAAiB;IAC5B,KAAK,CAAC,SAAS,CAAC,OAAuB;QACrC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC;YAAE,OAAO,KAAK,CAAC;QAEnE,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;YACjC,MAAM,0BAA0B,CAC9B,OAAO,CAAC,SAAS,EACjB,oBAAoB,CAAC,aAAa,EAAE;gBAClC,4CAA4C;aAC7C,CAAC,EACF,EAAE,KAAK,EAAE,OAAO,EAAE,CACnB,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC9B,MAAM,0BAA0B,CAC9B,OAAO,CAAC,SAAS,EACjB,oBAAoB,CAAC,aAAa,EAAE;gBAClC,wDAAwD;gBACxD,yBAAyB;aAC1B,CAAC,EACF,EAAE,KAAK,EAAE,OAAO,EAAE,CACnB,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAC7C,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,GAAG,CACZ,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;CACF","sourcesContent":["import { slashForms } from \"./manifest.js\";\nimport { matchCommand } from \"./parse.js\";\nimport type { CommandContext, CommandHandler } from \"./types.js\";\nimport { formatCommandSummary, replyDiagnosticWithContext } from \"./utils.js\";\n\nconst NEW_COMMANDS = slashForms(\"new\");\n\nexport class NewCommandHandler implements CommandHandler {\n  async tryHandle(context: CommandContext): Promise<boolean> {\n    if (!matchCommand(context.commandText, NEW_COMMANDS)) return false;\n\n    if (!context.privateConversation) {\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"New Session\", [\n          \"為了避免誤清除共享上下文，`/new` 目前只能在與機器人的私訊 / DM 中使用。\",\n        ]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    if (!context.services.runtime) {\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"New Session\", [\n          \"New command is not configured correctly on the server.\",\n          \"Please try again later.\",\n        ]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    await context.services.runtime.handleNewCommand(\n      context.sessionKey,\n      context.conversationId,\n      context.bot,\n    );\n    return true;\n  }\n}\n"]}

package/dist/commands/sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/commands/sandbox.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAGvF,YAAY,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAIvD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI,CAS7E;AAED,qBAAa,qBAAsB,YAAW,cAAc;IACpD,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAyFzD;CACF"}
+{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/commands/sandbox.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAGvF,YAAY,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAIvD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI,CAS7E;AAED,qBAAa,qBAAsB,YAAW,cAAc;IACpD,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAkGzD;CACF"}

package/dist/commands/sandbox.js

@@ -1,10 +1,10 @@
-import { join } from "node:path";
-import { updateConversationSettings } from "../config.js";
 import { readConversationWorkspaceMountMode } from "../execution-resolver.js";
-import { resolveActorVaultKey } from "../vault/routing.js";
+import { applyConversationSettings } from "../settings-mutation.js";
+import { actorKey } from "../sandbox/identity.js";
+import { slashForms } from "./manifest.js";
 import { matchCommand } from "./parse.js";
 import { formatCommandSummary, replyDiagnosticWithContext } from "./utils.js";
-const SANDBOX_COMMANDS = ["/pi-sandbox", "/sandbox"];
+const SANDBOX_COMMANDS = slashForms("sandbox");
 export function parseSandboxCommand(text) {
     const matched = matchCommand(text, SANDBOX_COMMANDS, { stripMention: true });
     if (!matched)
@@ -20,14 +20,20 @@ export class SandboxCommandHandler {
         const parsed = parseSandboxCommand(context.commandText);
         if (!parsed)
             return false;
-        if (context.services.sandbox.type !== "image" || !context.services.provisioner) {
-            await replyDiagnosticWithContext(context.responder, formatCommandSummary("Sandbox", ["`/pi-sandbox` 目前只支援 `image:*` managed sandbox。"]), { style: "muted" });
+        if ((context.services.sandbox.type !== "image" && context.services.sandbox.type !== "gondolin") ||
+            !context.services.resourceController) {
+            await replyDiagnosticWithContext(context.responder, formatCommandSummary("Sandbox", [
+                "`/pi-sandbox` 目前只支援 `image:*` 與 `gondolin:*` managed sandbox。",
+            ]), { style: "muted" });
             return true;
         }
-        const containerKey = resolveActorVaultKey(context.services.sandbox, context.platformUserId, context.conversationId);
+        const containerKey = actorKey(context.services.sandbox, {
+            userId: context.platformUserId,
+            conversationId: context.conversationId,
+        });
         if (parsed.action === "private" || parsed.action === "full") {
-            updateConversationSettings(join(context.services.workingDir, context.conversationId), {
-                sandboxImageWorkspaceMount: parsed.action,
+            applyConversationSettings(context.services.runtime, context.services.workingDir, context.conversationId, {
+                sandbox: { image: { workspaceMount: parsed.action } },
             });
             await replyDiagnosticWithContext(context.responder, formatCommandSummary("Sandbox Workspace", [
                 parsed.action === "full"
@@ -35,13 +41,13 @@ export class SandboxCommandHandler {
                     : "已將此 conversation 的 sandbox 設為 private workspace mode。",
                 `Workspace mount: ${parsed.action}`,
                 parsed.action === "full"
-                    ? "之後這個 container 會把整個 host workspace 掛到 /workspace。"
-                    : "之後這個 container 只會掛載 private workspace 檔案與當前 conversation 目錄。",
+                    ? "之後這個 runtime 會把整個 host workspace 掛到 /workspace。"
+                    : "之後這個 runtime 只會掛載 private workspace 檔案與當前 conversation 目錄。",
             ]), { style: "muted" });
             return true;
         }
         if (parsed.action === "boost") {
-            const boostLimits = context.services.provisioner.getBoostLimits();
+            const boostLimits = context.services.resourceController.getBoostLimits();
             if (!boostLimits?.cpus && !boostLimits?.memory) {
                 await replyDiagnosticWithContext(context.responder, formatCommandSummary("Sandbox Boost", [
                     "此 mikan instance 尚未設定 sandbox boost 規格。",
@@ -49,17 +55,17 @@ export class SandboxCommandHandler {
                 ]), { style: "muted" });
                 return true;
             }
-            const status = await context.services.provisioner.boost(containerKey);
+            const status = await context.services.resourceController.boost(containerKey);
             await replyDiagnosticWithContext(context.responder, formatCommandSummary("Sandbox Boost", [
                 "已暫時提升此 conversation 的 sandbox 規格。",
                 `Current: ${formatLimits(status.limits)}`,
-                "boost 會在此 sandbox container 關閉後結束。",
+                "boost 會在此 sandbox runtime 關閉後結束。",
             ]), { style: "muted" });
             return true;
         }
-        const status = context.services.provisioner.getLimitStatus(containerKey);
-        const defaultLimits = context.services.provisioner.getDefaultLimits();
-        const boostLimits = context.services.provisioner.getBoostLimits();
+        const status = context.services.resourceController.getLimitStatus(containerKey);
+        const defaultLimits = context.services.resourceController.getDefaultLimits();
+        const boostLimits = context.services.resourceController.getBoostLimits();
         const workspaceMount = readConversationWorkspaceMountMode(context.services.workingDir, context.conversationId);
         await replyDiagnosticWithContext(context.responder, formatCommandSummary("Sandbox", [
             `Current: ${formatLimits(status.limits)}`,

package/dist/commands/sandbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../src/commands/sandbox.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from \"node:path\";\nimport { updateConversationSettings } from \"../config.js\";\nimport { readConversationWorkspaceMountMode } from \"../execution-resolver.js\";\nimport { resolveActorVaultKey } from \"../vault/routing.js\";\nimport { matchCommand } from \"./parse.js\";\nimport type { CommandContext, CommandHandler, ParsedSandboxCommand } from \"./types.js\";\nimport { formatCommandSummary, replyDiagnosticWithContext } from \"./utils.js\";\n\nexport type { ParsedSandboxCommand } from \"./types.js\";\n\nconst SANDBOX_COMMANDS = [\"/pi-sandbox\", \"/sandbox\"] as const;\n\nexport function parseSandboxCommand(text: string): ParsedSandboxCommand | null {\n  const matched = matchCommand(text, SANDBOX_COMMANDS, { stripMention: true });\n  if (!matched) return null;\n\n  const action = matched.args.length === 1 ? matched.args[0].toLowerCase() : undefined;\n  if (action === \"boost\" || action === \"private\" || action === \"full\") {\n    return { action };\n  }\n  return {};\n}\n\nexport class SandboxCommandHandler implements CommandHandler {\n  async tryHandle(context: CommandContext): Promise<boolean> {\n    const parsed = parseSandboxCommand(context.commandText);\n    if (!parsed) return false;\n\n    if (context.services.sandbox.type !== \"image\" || !context.services.provisioner) {\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"Sandbox\", [\"`/pi-sandbox` 目前只支援 `image:*` managed sandbox。\"]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    const containerKey = resolveActorVaultKey(\n      context.services.sandbox,\n      context.platformUserId,\n      context.conversationId,\n    );\n\n    if (parsed.action === \"private\" || parsed.action === \"full\") {\n      updateConversationSettings(join(context.services.workingDir, context.conversationId), {\n        sandboxImageWorkspaceMount: parsed.action,\n      });\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"Sandbox Workspace\", [\n          parsed.action === \"full\"\n            ? \"已將此 conversation 的 sandbox 設為 full workspace mode。\"\n            : \"已將此 conversation 的 sandbox 設為 private workspace mode。\",\n          `Workspace mount: ${parsed.action}`,\n          parsed.action === \"full\"\n            ? \"之後這個 container 會把整個 host workspace 掛到 /workspace。\"\n            : \"之後這個 container 只會掛載 private workspace 檔案與當前 conversation 目錄。\",\n        ]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    if (parsed.action === \"boost\") {\n      const boostLimits = context.services.provisioner.getBoostLimits();\n      if (!boostLimits?.cpus && !boostLimits?.memory) {\n        await replyDiagnosticWithContext(\n          context.responder,\n          formatCommandSummary(\"Sandbox Boost\", [\n            \"此 mikan instance 尚未設定 sandbox boost 規格。\",\n            \"請先在全域 settings.json 設定 `sandbox.boost`。\",\n          ]),\n          { style: \"muted\" },\n        );\n        return true;\n      }\n\n      const status = await context.services.provisioner.boost(containerKey);\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"Sandbox Boost\", [\n          \"已暫時提升此 conversation 的 sandbox 規格。\",\n          `Current: ${formatLimits(status.limits)}`,\n          \"boost 會在此 sandbox container 關閉後結束。\",\n        ]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    const status = context.services.provisioner.getLimitStatus(containerKey);\n    const defaultLimits = context.services.provisioner.getDefaultLimits();\n    const boostLimits = context.services.provisioner.getBoostLimits();\n    const workspaceMount = readConversationWorkspaceMountMode(\n      context.services.workingDir,\n      context.conversationId,\n    );\n    await replyDiagnosticWithContext(\n      context.responder,\n      formatCommandSummary(\n        \"Sandbox\",\n        [\n          `Current: ${formatLimits(status.limits)}`,\n          `Status: ${status.boosted ? \"boosted\" : \"default\"}`,\n          `Workspace mount: ${workspaceMount}`,\n          \"\",\n          `Default: ${formatLimits(defaultLimits)}`,\n          boostLimits ? `Boost: ${formatLimits({ ...defaultLimits, ...boostLimits })}` : undefined,\n        ].filter((line): line is string => line !== undefined),\n      ),\n      { style: \"muted\" },\n    );\n    return true;\n  }\n}\n\nfunction formatLimits(limits: { cpus?: string; memory?: string } | undefined): string {\n  return `CPU ${limits?.cpus ?? \"unlimited\"} / Memory ${limits?.memory ?? \"unlimited\"}`;\n}\n"]}
+{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../src/commands/sandbox.ts"],"names":[],"mappings":"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","sourcesContent":["import { readConversationWorkspaceMountMode } from \"../execution-resolver.js\";\nimport { applyConversationSettings } from \"../settings-mutation.js\";\nimport { actorKey } from \"../sandbox/identity.js\";\nimport { slashForms } from \"./manifest.js\";\nimport { matchCommand } from \"./parse.js\";\nimport type { CommandContext, CommandHandler, ParsedSandboxCommand } from \"./types.js\";\nimport { formatCommandSummary, replyDiagnosticWithContext } from \"./utils.js\";\n\nexport type { ParsedSandboxCommand } from \"./types.js\";\n\nconst SANDBOX_COMMANDS = slashForms(\"sandbox\");\n\nexport function parseSandboxCommand(text: string): ParsedSandboxCommand | null {\n  const matched = matchCommand(text, SANDBOX_COMMANDS, { stripMention: true });\n  if (!matched) return null;\n\n  const action = matched.args.length === 1 ? matched.args[0].toLowerCase() : undefined;\n  if (action === \"boost\" || action === \"private\" || action === \"full\") {\n    return { action };\n  }\n  return {};\n}\n\nexport class SandboxCommandHandler implements CommandHandler {\n  async tryHandle(context: CommandContext): Promise<boolean> {\n    const parsed = parseSandboxCommand(context.commandText);\n    if (!parsed) return false;\n\n    if (\n      (context.services.sandbox.type !== \"image\" && context.services.sandbox.type !== \"gondolin\") ||\n      !context.services.resourceController\n    ) {\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"Sandbox\", [\n          \"`/pi-sandbox` 目前只支援 `image:*` 與 `gondolin:*` managed sandbox。\",\n        ]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    const containerKey = actorKey(context.services.sandbox, {\n      userId: context.platformUserId,\n      conversationId: context.conversationId,\n    });\n\n    if (parsed.action === \"private\" || parsed.action === \"full\") {\n      applyConversationSettings(\n        context.services.runtime,\n        context.services.workingDir,\n        context.conversationId,\n        {\n          sandbox: { image: { workspaceMount: parsed.action } },\n        },\n      );\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"Sandbox Workspace\", [\n          parsed.action === \"full\"\n            ? \"已將此 conversation 的 sandbox 設為 full workspace mode。\"\n            : \"已將此 conversation 的 sandbox 設為 private workspace mode。\",\n          `Workspace mount: ${parsed.action}`,\n          parsed.action === \"full\"\n            ? \"之後這個 runtime 會把整個 host workspace 掛到 /workspace。\"\n            : \"之後這個 runtime 只會掛載 private workspace 檔案與當前 conversation 目錄。\",\n        ]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    if (parsed.action === \"boost\") {\n      const boostLimits = context.services.resourceController.getBoostLimits();\n      if (!boostLimits?.cpus && !boostLimits?.memory) {\n        await replyDiagnosticWithContext(\n          context.responder,\n          formatCommandSummary(\"Sandbox Boost\", [\n            \"此 mikan instance 尚未設定 sandbox boost 規格。\",\n            \"請先在全域 settings.json 設定 `sandbox.boost`。\",\n          ]),\n          { style: \"muted\" },\n        );\n        return true;\n      }\n\n      const status = await context.services.resourceController.boost(containerKey);\n      await replyDiagnosticWithContext(\n        context.responder,\n        formatCommandSummary(\"Sandbox Boost\", [\n          \"已暫時提升此 conversation 的 sandbox 規格。\",\n          `Current: ${formatLimits(status.limits)}`,\n          \"boost 會在此 sandbox runtime 關閉後結束。\",\n        ]),\n        { style: \"muted\" },\n      );\n      return true;\n    }\n\n    const status = context.services.resourceController.getLimitStatus(containerKey);\n    const defaultLimits = context.services.resourceController.getDefaultLimits();\n    const boostLimits = context.services.resourceController.getBoostLimits();\n    const workspaceMount = readConversationWorkspaceMountMode(\n      context.services.workingDir,\n      context.conversationId,\n    );\n    await replyDiagnosticWithContext(\n      context.responder,\n      formatCommandSummary(\n        \"Sandbox\",\n        [\n          `Current: ${formatLimits(status.limits)}`,\n          `Status: ${status.boosted ? \"boosted\" : \"default\"}`,\n          `Workspace mount: ${workspaceMount}`,\n          \"\",\n          `Default: ${formatLimits(defaultLimits)}`,\n          boostLimits ? `Boost: ${formatLimits({ ...defaultLimits, ...boostLimits })}` : undefined,\n        ].filter((line): line is string => line !== undefined),\n      ),\n      { style: \"muted\" },\n    );\n    return true;\n  }\n}\n\nfunction formatLimits(limits: { cpus?: string; memory?: string } | undefined): string {\n  return `CPU ${limits?.cpus ?? \"unlimited\"} / Memory ${limits?.memory ?? \"unlimited\"}`;\n}\n"]}

package/dist/commands/text.d.ts

@@ -0,0 +1,2 @@
+export declare function isCommandText(text: string): boolean;
+//# sourceMappingURL=text.d.ts.map

package/dist/commands/text.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/commands/text.ts"],"names":[],"mappings":"AAkBA,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD"}

package/dist/commands/text.js

@@ -0,0 +1,16 @@
+import { COMMAND_MANIFEST } from "./manifest.js";
+/**
+ * Chat-command text recognition, derived from the command manifest so the
+ * inventory has a single source of truth. Session resume uses it to keep
+ * command messages out of replayed history.
+ *
+ * The `pi-[\w-]+` alternative is a catch-all for platform-prefixed command
+ * names (including ones a platform registers but this build no longer
+ * handles), independent of the manifest.
+ */
+const COMMAND_NAMES = COMMAND_MANIFEST.flatMap((entry) => [entry.name, ...(entry.aliases ?? [])]);
+const COMMAND_TEXT_PATTERN = new RegExp(`^\\/(?:pi-[\\w-]+|${COMMAND_NAMES.join("|")})(?:@\\w+)?(?:\\s|$)`, "i");
+export function isCommandText(text) {
+    return COMMAND_TEXT_PATTERN.test(text.trim());
+}
+//# sourceMappingURL=text.js.map

package/dist/commands/text.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/commands/text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD;;;;;;;;GAQG;AACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAElG,MAAM,oBAAoB,GAAG,IAAI,MAAM,CACrC,qBAAqB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,sBAAsB,EAClE,GAAG,CACJ,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AAChD,CAAC","sourcesContent":["import { COMMAND_MANIFEST } from \"./manifest.js\";\n\n/**\n * Chat-command text recognition, derived from the command manifest so the\n * inventory has a single source of truth. Session resume uses it to keep\n * command messages out of replayed history.\n *\n * The `pi-[\\w-]+` alternative is a catch-all for platform-prefixed command\n * names (including ones a platform registers but this build no longer\n * handles), independent of the manifest.\n */\nconst COMMAND_NAMES = COMMAND_MANIFEST.flatMap((entry) => [entry.name, ...(entry.aliases ?? [])]);\n\nconst COMMAND_TEXT_PATTERN = new RegExp(\n  `^\\\\/(?:pi-[\\\\w-]+|${COMMAND_NAMES.join(\"|\")})(?:@\\\\w+)?(?:\\\\s|$)`,\n  \"i\",\n);\n\nexport function isCommandText(text: string): boolean {\n  return COMMAND_TEXT_PATTERN.test(text.trim());\n}\n"]}

package/dist/commands/types.d.ts

@@ -2,6 +2,7 @@ import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
 import type { MessagingBot, ConversationContext, PlatformName } from "../adapter.js";
 import type { DockerContainerManager } from "../provisioner.js";
 import type { SandboxConfig } from "../sandbox/index.js";
+import type { SandboxResourceController } from "../types.js";
 import type { VaultManager } from "../vault/index.js";
 export interface LinkTokenStoreLike {
     create(platform: PlatformName, platformUserId: string, conversationId: string, vaultId: string, providerId: string): {
@@ -13,7 +14,7 @@ export interface SessionViewTokenStoreLike {
         token: string;
     };
 }
-interface AdminTokenStoreLike {
+export interface AdminTokenStoreLike {
     create(args: {
         platform: PlatformName;
         platformUserId: string;
@@ -34,6 +35,7 @@ export interface CommandServices {
     sandbox: SandboxConfig;
     vaultManager: VaultManager;
     provisioner?: DockerContainerManager;
+    resourceController?: SandboxResourceController;
     linkTokenStore: LinkTokenStoreLike;
     sessionViewTokenStore: SessionViewTokenStoreLike;
     adminTokenStore: AdminTokenStoreLike;
@@ -62,5 +64,16 @@ export interface ParsedModelCommand {
 export interface ParsedSandboxCommand {
     action?: "boost" | "private" | "full";
 }
+export type ParsedLoginCommand = {
+    action: "setup";
+} | {
+    action: "shared_create" | "shared_update" | "shared_delete";
+    name: string;
+} | {
+    action: "shared_list";
+} | {
+    action: "copy_shared";
+    name: string;
+};
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/commands/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/commands/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/commands/types.ts"],"names":[],"mappings":"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"}

package/dist/commands/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/commands/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport type { MessagingBot, ConversationContext, PlatformName } from \"../adapter.js\";\nimport type { DockerContainerManager } from \"../provisioner.js\";\nimport type { SandboxConfig } from \"../sandbox/index.js\";\nimport type { VaultManager } from \"../vault/index.js\";\n\nexport interface LinkTokenStoreLike {\n  create(\n    platform: PlatformName,\n    platformUserId: string,\n    conversationId: string,\n    vaultId: string,\n    providerId: string,\n  ): { token: string };\n}\n\nexport interface SessionViewTokenStoreLike {\n  create(\n    platform: PlatformName,\n    platformUserId: string,\n    conversationId: string,\n    sessionKey: string,\n    sessionFile: string,\n    platformUserName?: string,\n  ): { token: string };\n}\n\ninterface AdminTokenStoreLike {\n  create(args: {\n    platform: PlatformName;\n    platformUserId: string;\n    conversationId: string;\n    platformUserName?: string;\n  }): { token: string };\n}\n\ninterface CommandRuntimeBridge {\n  handleNewCommand(sessionKey: string, conversationId: string, bot: MessagingBot): Promise<void>;\n  switchConversationModel(conversationId: string, provider: string, model: string): boolean;\n  refreshConversationEnvironment(conversationId: string): boolean;\n}\n\nexport interface CommandServices {\n  workingDir: string;\n  runtime?: CommandRuntimeBridge;\n  sandbox: SandboxConfig;\n  vaultManager: VaultManager;\n  provisioner?: DockerContainerManager;\n  linkTokenStore: LinkTokenStoreLike;\n  sessionViewTokenStore: SessionViewTokenStoreLike;\n  adminTokenStore: AdminTokenStoreLike;\n  portalBaseUrl?: string;\n}\n\nexport interface CommandContext {\n  bot: MessagingBot;\n  responder: ConversationContext[\"responder\"];\n  platform: PlatformName;\n  platformUserId: string;\n  conversationId: string;\n  vaultConversationId?: string;\n  sessionKey: string;\n  commandText: string;\n  privateConversation: boolean;\n  services: CommandServices;\n}\n\nexport interface CommandHandler {\n  tryHandle(context: CommandContext): Promise<boolean>;\n}\n\n// ── command-specific parsed types ────────────────────────────────────────────\n\nexport interface ParsedModelCommand {\n  provider?: string;\n  model?: string;\n  thinkingLevel?: ThinkingLevel;\n}\n\nexport interface ParsedSandboxCommand {\n  action?: \"boost\" | \"private\" | \"full\";\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/commands/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport type { MessagingBot, ConversationContext, PlatformName } from \"../adapter.js\";\nimport type { DockerContainerManager } from \"../provisioner.js\";\nimport type { SandboxConfig } from \"../sandbox/index.js\";\nimport type { SandboxResourceController } from \"../types.js\";\nimport type { VaultManager } from \"../vault/index.js\";\n\nexport interface LinkTokenStoreLike {\n  create(\n    platform: PlatformName,\n    platformUserId: string,\n    conversationId: string,\n    vaultId: string,\n    providerId: string,\n  ): { token: string };\n}\n\nexport interface SessionViewTokenStoreLike {\n  create(\n    platform: PlatformName,\n    platformUserId: string,\n    conversationId: string,\n    sessionKey: string,\n    sessionFile: string,\n    platformUserName?: string,\n  ): { token: string };\n}\n\nexport interface AdminTokenStoreLike {\n  create(args: {\n    platform: PlatformName;\n    platformUserId: string;\n    conversationId: string;\n    platformUserName?: string;\n  }): { token: string };\n}\n\ninterface CommandRuntimeBridge {\n  handleNewCommand(sessionKey: string, conversationId: string, bot: MessagingBot): Promise<void>;\n  switchConversationModel(conversationId: string, provider: string, model: string): boolean;\n  refreshConversationEnvironment(conversationId: string): boolean;\n}\n\nexport interface CommandServices {\n  workingDir: string;\n  runtime?: CommandRuntimeBridge;\n  sandbox: SandboxConfig;\n  vaultManager: VaultManager;\n  provisioner?: DockerContainerManager;\n  resourceController?: SandboxResourceController;\n  linkTokenStore: LinkTokenStoreLike;\n  sessionViewTokenStore: SessionViewTokenStoreLike;\n  adminTokenStore: AdminTokenStoreLike;\n  portalBaseUrl?: string;\n}\n\nexport interface CommandContext {\n  bot: MessagingBot;\n  responder: ConversationContext[\"responder\"];\n  platform: PlatformName;\n  platformUserId: string;\n  conversationId: string;\n  vaultConversationId?: string;\n  sessionKey: string;\n  commandText: string;\n  privateConversation: boolean;\n  services: CommandServices;\n}\n\nexport interface CommandHandler {\n  tryHandle(context: CommandContext): Promise<boolean>;\n}\n\n// ── command-specific parsed types ────────────────────────────────────────────\n\nexport interface ParsedModelCommand {\n  provider?: string;\n  model?: string;\n  thinkingLevel?: ThinkingLevel;\n}\n\nexport interface ParsedSandboxCommand {\n  action?: \"boost\" | \"private\" | \"full\";\n}\n\nexport type ParsedLoginCommand =\n  | { action: \"setup\" }\n  | { action: \"shared_create\" | \"shared_update\" | \"shared_delete\"; name: string }\n  | { action: \"shared_list\" }\n  | { action: \"copy_shared\"; name: string };\n"]}

package/dist/config.d.ts

@@ -2,7 +2,7 @@ export declare class MissingGlobalSettingsError extends Error {
     readonly settingsPath: string;
     constructor(settingsPath: string);
 }
-export type { AgentConfig, AutoReplyConfig, JudgeModelConfig } from "./types.js";
+export type { AgentConfig, AutoReplyConfig, JudgeModelConfig, SandboxSettings } from "./types.js";
 import type { AgentConfig, AutoReplyConfig, JudgeModelConfig } from "./types.js";
 export declare function loadGlobalSettings(): AgentConfig;
 /**
@@ -48,8 +48,6 @@ export declare function loadConversationAutoReplyConfig(conversationDir: string)
  * @deprecated Auto-reply is kept for compatibility while its future is undecided.
  */
 export declare function saveConversationAutoReplyConfig(conversationDir: string, config: AutoReplyConfig): void;
-export declare function resolveWorkspaceDirFromArgv(args?: string[]): string | undefined;
-export declare function resolveStateDirFromArgv(args?: string[]): string;
 /**
  * True when `child` is `parent` or a path inside it. Purely lexical (no
  * symlink resolution) — used for configuration sanity checks, not as the

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAUA,qBAAa,0BAA2B,SAAQ,KAAK;aACvB,YAAY,EAAE,MAAM;IAAhD,YAA4B,YAAY,EAAE,MAAM,EAG/C;CACF;AAED,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA2LjF,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CA2BxE;AAED,wBAAgB,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,WAAW,CAMhF;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAUlF;AAUD;;;;;;;;GAQG;AACH,wBAAgB,+BAA+B,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe,CAYxF;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,eAAe,GACtB,IAAI,CAaN;AAED,wBAAgB,2BAA2B,CAAC,IAAI,WAAwB,GAAG,MAAM,GAAG,SAAS,CA2B5F;AAED,wBAAgB,uBAAuB,CAAC,IAAI,WAAwB,GAAG,MAAM,CAY5E;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAInE;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,GAClB,IAAI,CAWN;AAED,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAOrD;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAQjE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAIvD;AA4FD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAEtE;AAED,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,GAC1B,IAAI,CAEN"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAUA,qBAAa,0BAA2B,SAAQ,KAAK;aACvB,YAAY,EAAE,MAAM;IAAhD,YAA4B,YAAY,EAAE,MAAM,EAG/C;CACF;AAED,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClG,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAAmB,MAAM,YAAY,CAAC;AAgQlG,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CA2BxE;AAED,wBAAgB,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,WAAW,CAahF;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAUlF;AAUD;;;;;;;;GAQG;AACH,wBAAgB,+BAA+B,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe,CAYxF;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,eAAe,GACtB,IAAI,CAaN;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAInE;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,GAClB,IAAI,CAWN;AAOD,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAGrD;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAQjE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAIvD;AAqED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAEtE;AAED,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,GAC1B,IAAI,CAEN"}

package/dist/config.js

@@ -1,7 +1,7 @@
 import { Type } from "@sinclair/typebox";
 import { existsSync, readFileSync, renameSync, rmSync } from "fs";
-import { homedir } from "os";
 import { basename, dirname, join, resolve } from "path";
+import { effectiveStateDir } from "./cli/arg-grammar.js";
 import { readEnv } from "./utils/env.js";
 import { ensureDirExists, readJsonSchemaFileIfExists } from "./utils/file-guards.js";
 import { atomicWritePrivateFile } from "./utils/fs-atomic.js";
@@ -50,6 +50,7 @@ const SettingsFileSchema = Type.Object({
             Type.Literal("medium"),
             Type.Literal("high"),
             Type.Literal("xhigh"),
+            Type.Literal("max"),
         ])),
         autoReply: Type.Optional(Type.Object({
             provider: Type.Optional(Type.String()),
@@ -72,6 +73,40 @@ const SettingsFileSchema = Type.Object({
         image: Type.Optional(Type.Object({
             workspaceMount: Type.Optional(Type.Union([Type.Literal("private"), Type.Literal("full")])),
         })),
+        gondolin: Type.Optional(Type.Object({
+            remote: Type.Optional(Type.Object({
+                url: Type.Optional(Type.String()),
+                caFile: Type.Optional(Type.String()),
+                certFile: Type.Optional(Type.String()),
+                keyFile: Type.Optional(Type.String()),
+                workspaceRoot: Type.Optional(Type.String()),
+                maxRuntimes: Type.Optional(Type.Number()),
+                imageSelector: Type.Optional(Type.String()),
+                queueWaitSeconds: Type.Optional(Type.Number()),
+                workers: Type.Optional(Type.Array(Type.Object({
+                    name: Type.Optional(Type.String()),
+                    url: Type.String(),
+                    caFile: Type.Optional(Type.String()),
+                    certFile: Type.Optional(Type.String()),
+                    keyFile: Type.Optional(Type.String()),
+                    workspaceRoot: Type.Optional(Type.String()),
+                    maxRuntimes: Type.Optional(Type.Number()),
+                    draining: Type.Optional(Type.Boolean()),
+                }))),
+                gateway: Type.Optional(Type.Object({
+                    port: Type.Number(),
+                    certFile: Type.Optional(Type.String()),
+                    keyFile: Type.Optional(Type.String()),
+                    clientCaFile: Type.Optional(Type.String()),
+                    hostnames: Type.Optional(Type.Array(Type.String())),
+                    workspaceRoot: Type.Optional(Type.String()),
+                    workers: Type.Optional(Type.Record(Type.String(), Type.Object({
+                        maxRuntimes: Type.Optional(Type.Number()),
+                        draining: Type.Optional(Type.Boolean()),
+                    }))),
+                })),
+            })),
+        })),
         defaultSharedVault: Type.Optional(Type.String()),
     })),
     autoReply: Type.Optional(Type.Object({
@@ -85,8 +120,7 @@ function loadSettingsFile(settingsPath) {
         : `Malformed settings file at ${settingsPath}: ${detail}`);
 }
 function getStateDir() {
-    const raw = readEnv("STATE_DIR");
-    return raw ? resolve(raw) : join(homedir(), ".mikan");
+    return effectiveStateDir();
 }
 function normalizeSettingsConfig(config) {
     return {
@@ -94,23 +128,50 @@ function normalizeSettingsConfig(config) {
         ...(config.llm?.model !== undefined ? { model: config.llm.model } : {}),
         ...(config.llm?.thinkingLevel !== undefined ? { thinkingLevel: config.llm.thinkingLevel } : {}),
         ...(config.sentry?.dsn !== undefined ? { sentryDsn: config.sentry.dsn } : {}),
-        ...(config.sandbox?.cpus !== undefined ? { sandboxCpus: config.sandbox.cpus } : {}),
-        ...(config.sandbox?.memory !== undefined ? { sandboxMemory: config.sandbox.memory } : {}),
-        ...(config.sandbox?.boost?.cpus !== undefined
-            ? { sandboxBoostCpus: config.sandbox.boost.cpus }
-            : {}),
-        ...(config.sandbox?.boost?.memory !== undefined
-            ? { sandboxBoostMemory: config.sandbox.boost.memory }
-            : {}),
-        ...(config.sandbox?.image?.workspaceMount !== undefined
-            ? { sandboxImageWorkspaceMount: config.sandbox.image.workspaceMount }
-            : {}),
-        ...(config.sandbox?.defaultSharedVault?.trim()
-            ? { defaultSharedVault: config.sandbox.defaultSharedVault.trim() }
-            : {}),
+        ...(config.sandbox !== undefined ? { sandbox: normalizeSandboxSettings(config.sandbox) } : {}),
         ...(config.slack !== undefined ? { slack: config.slack } : {}),
     };
 }
+/**
+ * File shape → in-memory shape for the sandbox group. An empty or
+ * whitespace-only `defaultSharedVault` means "no default" and is dropped;
+ * non-empty values are trimmed. Everything else passes through as-is.
+ */
+function normalizeSandboxSettings(sandbox) {
+    const defaultSharedVault = sandbox.defaultSharedVault?.trim();
+    return {
+        ...(sandbox.cpus !== undefined ? { cpus: sandbox.cpus } : {}),
+        ...(sandbox.memory !== undefined ? { memory: sandbox.memory } : {}),
+        ...(sandbox.boost !== undefined ? { boost: sandbox.boost } : {}),
+        ...(sandbox.image !== undefined ? { image: sandbox.image } : {}),
+        ...(sandbox.gondolin !== undefined ? { gondolin: sandbox.gondolin } : {}),
+        ...(defaultSharedVault ? { defaultSharedVault } : {}),
+    };
+}
+/**
+ * Merge two sandbox settings groups. The merge invariant is LEAF-LEVEL:
+ * an override that only sets `sandbox.memory` keeps the base `sandbox.cpus`,
+ * and an override that only sets `boost.memory` keeps the base `boost.cpus`
+ * (same for `image`). This mirrors how the fields merged when they were
+ * flat top-level keys; a group-level spread would silently drop base leaves.
+ */
+function mergeSandboxSettings(base, override) {
+    if (!base)
+        return override;
+    if (!override)
+        return base;
+    return {
+        ...base,
+        ...override,
+        ...(base.boost || override.boost ? { boost: { ...base.boost, ...override.boost } } : {}),
+        ...(base.image || override.image ? { image: { ...base.image, ...override.image } } : {}),
+        // `remote` is one connection description; merging two halves of it would
+        // pair a URL with the wrong certificates, so the override wins wholesale.
+        ...(base.gondolin || override.gondolin
+            ? { gondolin: { ...base.gondolin, ...override.gondolin } }
+            : {}),
+    };
+}
 function getSettingsPath() {
     return join(getStateDir(), "settings.json");
 }
@@ -135,25 +196,15 @@ function toAgentConfig(fromFile) {
     const provider = requireString(fromFile.provider, "llm.provider");
     const model = requireString(fromFile.model, "llm.model");
     const thinkingLevel = requireThinkingLevel(fromFile.thinkingLevel);
-    const sentryDsn = fromFile.sentryDsn ?? process.env.SENTRY_DSN;
-    const sandboxCpus = fromFile.sandboxCpus;
-    const sandboxMemory = fromFile.sandboxMemory;
-    const sandboxBoostCpus = fromFile.sandboxBoostCpus;
-    const sandboxBoostMemory = fromFile.sandboxBoostMemory;
-    const sandboxImageWorkspaceMount = fromFile.sandboxImageWorkspaceMount;
-    const defaultSharedVault = fromFile.defaultSharedVault;
+    const sentryDsn = sentryDsnFrom(fromFile.sentryDsn);
+    const sandbox = fromFile.sandbox;
     const slack = fromFile.slack;
     return {
         provider,
         model,
         thinkingLevel,
         sentryDsn,
-        sandboxCpus,
-        sandboxMemory,
-        sandboxBoostCpus,
-        sandboxBoostMemory,
-        sandboxImageWorkspaceMount,
-        defaultSharedVault,
+        sandbox,
         slack,
     };
 }
@@ -213,7 +264,14 @@ export function conversationSettingsPath(conversationDir) {
 export function resolveConversationSettings(conversationDir) {
     const globalConfig = loadRawGlobalSettings();
     const conversationConfig = normalizeSettingsConfig(loadSettingsFile(conversationSettingsPath(conversationDir)) ?? {});
-    return toAgentConfig({ ...globalConfig, ...conversationConfig });
+    // The sandbox group merges at the leaf level (see mergeSandboxSettings):
+    // a conversation that only sets sandbox.memory keeps the global sandbox.cpus.
+    const sandbox = mergeSandboxSettings(globalConfig.sandbox, conversationConfig.sandbox);
+    return toAgentConfig({
+        ...globalConfig,
+        ...conversationConfig,
+        ...(sandbox ? { sandbox } : {}),
+    });
 }
 /**
  * Resolve the model used to judge auto-reply rules. Falls back to the main
@@ -275,39 +333,6 @@ export function saveConversationAutoReplyConfig(conversationDir, config) {
     }
     atomicWritePrivateFile(targetPath, config.rules.join("\n"));
 }
-export function resolveWorkspaceDirFromArgv(args = process.argv.slice(2)) {
-    for (let i = 0; i < args.length; i++) {
-        const arg = args[i];
-        if (arg === "--sandbox" || arg === "--download" || arg === "--state-dir") {
-            i += 1;
-            continue;
-        }
-        if (arg === "--version" || arg === "-v" || arg === "-V" || arg === "--onboard") {
-            continue;
-        }
-        if (arg.startsWith("--sandbox=") ||
-            arg.startsWith("--download=") ||
-            arg.startsWith("--state-dir=")) {
-            continue;
-        }
-        if (!arg.startsWith("-")) {
-            return arg;
-        }
-    }
-    return undefined;
-}
-export function resolveStateDirFromArgv(args = process.argv.slice(2)) {
-    for (let i = 0; i < args.length; i++) {
-        const arg = args[i];
-        if (arg.startsWith("--state-dir=")) {
-            return resolve(arg.slice("--state-dir=".length));
-        }
-        if (arg === "--state-dir") {
-            return resolve(args[++i] || "");
-        }
-    }
-    return join(homedir(), ".mikan");
-}
 /**
  * True when `child` is `parent` or a path inside it. Purely lexical (no
  * symlink resolution) — used for configuration sanity checks, not as the
@@ -338,12 +363,13 @@ export function assertStateDirOutsideWorkspace(stateDir, workingDir, sandboxType
     }
     throw new Error(message);
 }
+/** Settings-file DSN wins over SENTRY_DSN env — the rule lives only here. */
+function sentryDsnFrom(fromFile) {
+    return fromFile || readEnv("SENTRY_DSN");
+}
 export function resolveSentryDsn() {
     const fromFile = normalizeSettingsConfig(loadSettingsFile(getSettingsPath()) ?? {});
-    if (fromFile.sentryDsn) {
-        return fromFile.sentryDsn;
-    }
-    return process.env.SENTRY_DSN;
+    return sentryDsnFrom(fromFile.sentryDsn);
 }
 export function createGlobalSettingsFile(stateDir) {
     const settingsPath = join(stateDir, "settings.json");
@@ -390,33 +416,10 @@ function patchSettingsConfig(existing, config) {
             ...existing.sentry,
             ...(config.sentryDsn !== undefined ? { dsn: config.sentryDsn } : {}),
         },
-        sandbox: {
-            ...existing.sandbox,
-            ...(config.sandboxCpus !== undefined ? { cpus: config.sandboxCpus } : {}),
-            ...(config.sandboxMemory !== undefined ? { memory: config.sandboxMemory } : {}),
-            ...(config.sandboxBoostCpus !== undefined || config.sandboxBoostMemory !== undefined
-                ? {
-                    boost: {
-                        ...existing.sandbox?.boost,
-                        ...(config.sandboxBoostCpus !== undefined ? { cpus: config.sandboxBoostCpus } : {}),
-                        ...(config.sandboxBoostMemory !== undefined
-                            ? { memory: config.sandboxBoostMemory }
-                            : {}),
-                    },
-                }
-                : {}),
-            ...(config.sandboxImageWorkspaceMount !== undefined
-                ? {
-                    image: {
-                        ...existing.sandbox?.image,
-                        workspaceMount: config.sandboxImageWorkspaceMount,
-                    },
-                }
-                : {}),
-            ...(config.defaultSharedVault !== undefined
-                ? { defaultSharedVault: config.defaultSharedVault }
-                : {}),
-        },
+        // Leaf-level merge: a patch that only sets sandbox.boost.memory keeps the
+        // existing boost.cpus (and every other existing leaf). compactSettingsConfig
+        // drops the group entirely when it ends up with no defined values.
+        sandbox: mergeSandboxSettings(existing.sandbox, config.sandbox) ?? {},
         slack: {
             ...existing.slack,
             ...config.slack,