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

package/dist/agent.js

@@ -770,6 +770,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 +780,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 +814,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 +827,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,