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

package/dist/agent.js

@@ -172,12 +172,12 @@ function buildEnvDescription(sandboxType, workspaceRoot) {
 - Bash commands start in: ${workspaceRoot}
 - Install tools with the container's package manager
 - Your changes persist across sessions`;
-        case "firecracker":
-            return `You are running inside a Firecracker microVM.
+        case "agent-sandbox":
+            return `You are running inside a Kata-isolated Agent Sandbox microVM.
 - Runtime workspace root: ${workspaceRoot}
-- Use cd or absolute paths; project files are under ${workspaceRoot}
-- Install tools with: apt-get install <package> (Debian-based)
-- Your changes persist across sessions`;
+- Bash commands start in: ${workspaceRoot}
+- The workspace is shared with the mikan control plane
+- Your sandbox is released after its idle timeout`;
         case "cloudflare":
             return `You are running through a Cloudflare Sandbox bridge.
 - Runtime workspace root: ${workspaceRoot}
@@ -205,8 +205,7 @@ export function resolveTriggerAttribution(message) {
 function buildSystemPrompt(workspacePath, conversationId, conversationKind, currentUserId, memory, sandboxConfig, platform, skills) {
     const { workspaceRoot, conversationPath, scratchPath } = buildRuntimePaths(workspacePath, conversationId);
     const sandboxType = sandboxConfig.type;
-    const isContainerLike = sandboxType === "container" || sandboxType === "image";
-    const isFirecracker = sandboxType === "firecracker";
+    const isContainerLike = sandboxType === "container" || sandboxType === "image" || sandboxType === "agent-sandbox";
     // Format channel mappings
     const channelMappings = platform.channels.length > 0
         ? platform.channels.map((c) => `${c.id}\t#${c.name}`).join("\n")
@@ -325,7 +324,7 @@ Update this file whenever you modify the environment. On fresh container, read i
 Format: \`{"date":"...","ts":"...","user":"...","userName":"...","text":"...","isMessagingBot":false}\`
 The log contains user messages and your final responses (not tool calls/results).
 Use \`log.jsonl\` for quick grep-style history. Use \`${conversationPath}/sessions/\` when you need structured turns, tool outputs, or thread/session lineage.
-${isContainerLike || isFirecracker ? "Install jq: apt-get install jq" : ""}
+${isContainerLike ? "Install jq using the runtime image's package manager." : ""}
 \`\`\`bash
 # Recent messages
 tail -30 log.jsonl | jq -c '{date: .date[0:19], user: (.userName // .user), text}'
@@ -695,7 +694,7 @@ function buildThreadSessionName(message) {
 }
 function createRunnerExecutionContext(sandboxConfig, vaultManager, provisioner, workspaceDir, hostWorkspacePath) {
     const executionResolver = vaultManager && sandboxConfig.type !== "host"
-        ? new ActorExecutionResolver(sandboxConfig, vaultManager, provisioner, workspaceDir, hostWorkspacePath)
+        ? new ActorExecutionResolver(sandboxConfig, vaultManager, provisioner, workspaceDir)
         : undefined;
     // activeExecutor is replaced at the start of each run() call when executionResolver
     // is present, so the stable `executor` wrapper always delegates to the latest resolved value.
@@ -770,6 +769,7 @@ async function createConfiguredAgentSession(params) {
     // Host-only dirs under the state dir: extension code runs in the mikan
     // process, so it must never load from workspace paths — those are mounted
     // into sandbox containers and agent-writable (sandbox escape otherwise).
+    let session;
     const extensionsResult = await loadExtensions({
         dirs: defaultExtensionDirs(conversationId, effectiveStateDir()),
         context: { conversationId, workspaceDir, model, thinkingLevel },
@@ -779,14 +779,24 @@ async function createConfiguredAgentSession(params) {
             platformNotifier,
             platformReactor,
             platformUploader,
-            runSubagentService: (request, extensionTools) => runSubagent({
-                request,
-                defaultModel: model,
-                thinkingLevel,
-                models,
-                workspaceDir,
-                availableTools: [...tools, ...extensionTools],
-            }),
+            runSubagentService: (request, extensionTools) => {
+                const activeParent = session?.isActiveRun ? session : undefined;
+                return runSubagent({
+                    request,
+                    defaultModel: model,
+                    thinkingLevel,
+                    models,
+                    workspaceDir,
+                    availableTools: [...tools, ...extensionTools],
+                    slots: globalSubagentSlots,
+                    ...(activeParent
+                        ? {
+                            parentMessages: [...activeParent.messages],
+                            onUsage: (usage) => activeParent.foldExternalUsage(usage),
+                        }
+                        : {}),
+                });
+            },
         }),
     });
     const contributedTools = extensionsResult.registry.getContributedTools();
@@ -803,12 +813,11 @@ async function createConfiguredAgentSession(params) {
         models,
         workspaceDir,
         availableTools: [...tools, ...contributedTools],
-        // `session` is the const below: the tool only executes inside that
-        // session's own prompt loop, and the temporal dead zone turns any
-        // earlier call into a loud error instead of a silently dropped fold.
+        slots: globalSubagentSlots,
+        parentMessages: [...session.messages],
         onUsage: (usage) => session.foldExternalUsage(usage),
-    }), globalSubagentSlots);
-    const session = new MikanAgentSession({
+    }));
+    session = new MikanAgentSession({
         systemPrompt,
         model,
         thinkingLevel,
@@ -817,12 +826,13 @@ async function createConfiguredAgentSession(params) {
         sessionStore,
         extensions: extensionsResult.registry,
     });
-    const reloaded = session.reloadFromSession();
+    const activeSession = session;
+    const reloaded = activeSession.reloadFromSession();
     if (reloaded > 0) {
         log.logInfo(`[${conversationId}] Reloaded ${reloaded} messages from session context`);
     }
     return {
-        session,
+        session: activeSession,
         extensionSkills: extensionsResult.skills,
         extensionRegistry: extensionsResult.registry,
         disposeExtensions: extensionsResult.dispose,