maka-agent 0.2.0-dev.31.20260913 → 0.2.0-dev.32.20260914

package/node_modules/@maka/runtime/dist/session-manager.js

@@ -237,6 +237,15 @@ export class SessionManager {
             ...(header.projectId !== undefined ? { sourceProjectId: header.projectId } : {}),
         });
     }
+    async resolveChildToolNames(parentSessionId, parentHeader, definition) {
+        const availableChildTools = await this.childToolsForSession(parentSessionId);
+        assertAgentDefinitionRunnable({
+            definition,
+            tools: availableChildTools,
+            worktreeChildExecutorAvailable: await this.isWorktreeChildExecutorAvailable(parentHeader),
+        });
+        return buildToolsForAgentDefinition(availableChildTools, definition).map((tool) => tool.name);
+    }
     async finalizeAndListChildTurnArtifacts(sessionId, turnId, status) {
         const list = this.deps.listArtifactsForTurn;
         if (!list)
@@ -1450,13 +1459,13 @@ export class SessionManager {
         const definition = resolvedPreset
             ? requireBuiltinAgentDefinitionByProfile(resolvedPreset.profile)
             : requireBuiltinAgentDefinition(input.agentId);
-        const availableChildTools = await this.childToolsForSession(input.source.sessionId);
-        assertAgentDefinitionRunnable({
-            definition,
-            tools: availableChildTools,
-            worktreeChildExecutorAvailable: await this.isWorktreeChildExecutorAvailable(parentHeader),
-        });
-        const resolvedToolNames = buildToolsForAgentDefinition(availableChildTools, definition).map((tool) => tool.name);
+        const executorId = input.executorId ?? (resolvedPreset ? undefined : parentHeader.executorId);
+        if (executorId) {
+            this.deps.assertChildExecutorAvailable?.(input.source.sessionId, executorId);
+        }
+        const resolvedToolNames = executorId
+            ? []
+            : await this.resolveChildToolNames(input.source.sessionId, parentHeader, definition);
         const childPermissionMode = parentHeader.permissionMode === 'bypass' ? 'bypass' : definition.permissionMode;
         const initialTurnId = this.deps.newId();
         const initialRunId = this.deps.newId();
@@ -1482,6 +1491,7 @@ export class SessionManager {
                 toolNames: resolvedToolNames,
                 categoryPolicy: {},
                 systemPrompt: definition.systemPrompt,
+                executorId: executorId ?? null,
                 ...(resolvedPreset
                     ? {
                         preset: {
@@ -1512,20 +1522,28 @@ export class SessionManager {
             cwd: workspace?.worktreePath ?? parentHeader.cwd,
             ...(parentHeader.projectId !== undefined ? { projectId: parentHeader.projectId } : {}),
             name: resolvedPreset?.name ?? definition.name,
-            ...(resolvedPreset
-                ? { llmConnectionId: resolvedPreset.connectionId }
-                : parentHeader.llmConnectionId === undefined
-                    ? {}
-                    : { llmConnectionId: parentHeader.llmConnectionId }),
-            llmConnectionSlug: resolvedPreset?.connectionSlug ?? parentHeader.llmConnectionSlug,
-            model: resolvedPreset?.model ?? parentHeader.model,
-            ...(resolvedPreset
-                ? resolvedPreset.thinkingLevel !== undefined
-                    ? { thinkingLevel: resolvedPreset.thinkingLevel }
-                    : {}
-                : parentHeader.thinkingLevel !== undefined
-                    ? { thinkingLevel: parentHeader.thinkingLevel }
-                    : {}),
+            ...(executorId
+                ? {
+                    executorId,
+                    llmConnectionSlug: `executor:${executorId}`,
+                    model: executorId,
+                }
+                : {
+                    ...(resolvedPreset
+                        ? { llmConnectionId: resolvedPreset.connectionId }
+                        : parentHeader.llmConnectionId === undefined
+                            ? {}
+                            : { llmConnectionId: parentHeader.llmConnectionId }),
+                    llmConnectionSlug: resolvedPreset?.connectionSlug ?? parentHeader.llmConnectionSlug,
+                    model: resolvedPreset?.model ?? parentHeader.model,
+                    ...(resolvedPreset
+                        ? resolvedPreset.thinkingLevel !== undefined
+                            ? { thinkingLevel: resolvedPreset.thinkingLevel }
+                            : {}
+                        : parentHeader.thinkingLevel !== undefined
+                            ? { thinkingLevel: parentHeader.thinkingLevel }
+                            : {}),
+                }),
             permissionMode: childPermissionMode,
             collaborationMode: 'agent',
             orchestrationMode: 'default',
@@ -1924,13 +1942,12 @@ export class SessionManager {
         ]);
         this.assertActiveParentRun(parentSessionId, parentRun, input.spawnedBy.parentTurnId);
         const definition = requireBuiltinAgentDefinitionByProfile(input.agentProfile);
-        const availableChildTools = await this.childToolsForSession(parentSessionId);
-        assertAgentDefinitionRunnable({
-            definition,
-            tools: availableChildTools,
-            worktreeChildExecutorAvailable: await this.isWorktreeChildExecutorAvailable(parentHeader),
-        });
-        const resolvedToolNames = buildToolsForAgentDefinition(availableChildTools, definition).map((tool) => tool.name);
+        const executorId = input.executorId ?? (input.resolvedPreset ? undefined : parentHeader.executorId);
+        if (executorId)
+            this.deps.assertChildExecutorAvailable?.(parentSessionId, executorId);
+        const resolvedToolNames = executorId
+            ? []
+            : await this.resolveChildToolNames(parentSessionId, parentHeader, definition);
         const proposedTurnId = input.turnId ?? this.deps.newId();
         const proposedRunId = input.runId ?? this.deps.newId();
         const workspace = await this.provisionChildWorkspace(parentHeader, definition, requestFingerprint);
@@ -1938,20 +1955,28 @@ export class SessionManager {
             cwd: workspace?.worktreePath ?? parentHeader.cwd,
             ...(parentHeader.projectId !== undefined ? { projectId: parentHeader.projectId } : {}),
             name: input.name ?? input.resolvedPreset?.name ?? definition.name,
-            ...(input.resolvedPreset
-                ? { llmConnectionId: input.resolvedPreset.connectionId }
-                : parentHeader.llmConnectionId === undefined
-                    ? {}
-                    : { llmConnectionId: parentHeader.llmConnectionId }),
-            llmConnectionSlug: input.resolvedPreset?.connectionSlug ?? parentHeader.llmConnectionSlug,
-            model: input.resolvedPreset?.model ?? parentHeader.model,
-            ...(input.resolvedPreset
-                ? input.resolvedPreset.thinkingLevel !== undefined
-                    ? { thinkingLevel: input.resolvedPreset.thinkingLevel }
-                    : {}
-                : parentHeader.thinkingLevel !== undefined
-                    ? { thinkingLevel: parentHeader.thinkingLevel }
-                    : {}),
+            ...(executorId
+                ? {
+                    executorId,
+                    llmConnectionSlug: `executor:${executorId}`,
+                    model: executorId,
+                }
+                : {
+                    ...(input.resolvedPreset
+                        ? { llmConnectionId: input.resolvedPreset.connectionId }
+                        : parentHeader.llmConnectionId === undefined
+                            ? {}
+                            : { llmConnectionId: parentHeader.llmConnectionId }),
+                    llmConnectionSlug: input.resolvedPreset?.connectionSlug ?? parentHeader.llmConnectionSlug,
+                    model: input.resolvedPreset?.model ?? parentHeader.model,
+                    ...(input.resolvedPreset
+                        ? input.resolvedPreset.thinkingLevel !== undefined
+                            ? { thinkingLevel: input.resolvedPreset.thinkingLevel }
+                            : {}
+                        : parentHeader.thinkingLevel !== undefined
+                            ? { thinkingLevel: parentHeader.thinkingLevel }
+                            : {}),
+                }),
             permissionMode: definition.permissionMode,
             collaborationMode: 'agent',
             orchestrationMode: 'default',
@@ -2545,7 +2570,7 @@ export class SessionManager {
         const opening = {
             kind: 'invocation_opened',
             protocol: 'invocation_opened_v1',
-            route: session.llmConnectionId === undefined
+            route: session.llmConnectionId === undefined || session.backend === 'plugin-executor'
                 ? {
                     provenance: 'unknown',
                     backendKind: session.backend,
@@ -3367,6 +3392,7 @@ export function headerToSummary(h) {
         ...(h.revisionIndex !== undefined ? { revisionIndex: h.revisionIndex } : {}),
         ...(h.revisionState ? { revisionState: h.revisionState } : {}),
         backend: h.backend,
+        ...(h.executorId ? { executorId: h.executorId } : {}),
         ...(h.llmConnectionId === undefined ? {} : { llmConnectionId: h.llmConnectionId }),
         llmConnectionSlug: h.llmConnectionSlug,
         connectionLocked: h.connectionLocked,
@@ -3435,30 +3461,44 @@ function childSessionSpawnKey(parentSessionId, input) {
     ]);
 }
 function childSessionRequestFingerprint(parentSessionId, input) {
-    const payload = input.resolvedPreset
+    const payload = input.executorId
         ? [
-            2,
+            3,
             parentSessionId,
             input.spawnedBy.parentRunId,
             input.spawnedBy.parentTurnId,
             input.spawnedBy.toolCallId,
             input.agentProfile,
-            input.resolvedPreset,
+            input.executorId,
+            input.resolvedPreset ?? null,
             input.prompt,
             input.swarm?.swarmId ?? null,
             input.swarm?.itemId ?? null,
         ]
-        : [
-            1,
-            parentSessionId,
-            input.spawnedBy.parentRunId,
-            input.spawnedBy.parentTurnId,
-            input.spawnedBy.toolCallId,
-            input.agentProfile,
-            input.prompt,
-            input.swarm?.swarmId ?? null,
-            input.swarm?.itemId ?? null,
-        ];
+        : input.resolvedPreset
+            ? [
+                2,
+                parentSessionId,
+                input.spawnedBy.parentRunId,
+                input.spawnedBy.parentTurnId,
+                input.spawnedBy.toolCallId,
+                input.agentProfile,
+                input.resolvedPreset,
+                input.prompt,
+                input.swarm?.swarmId ?? null,
+                input.swarm?.itemId ?? null,
+            ]
+            : [
+                1,
+                parentSessionId,
+                input.spawnedBy.parentRunId,
+                input.spawnedBy.parentTurnId,
+                input.spawnedBy.toolCallId,
+                input.agentProfile,
+                input.prompt,
+                input.swarm?.swarmId ?? null,
+                input.swarm?.itemId ?? null,
+            ];
     return createHash('sha256').update(JSON.stringify(payload)).digest('hex');
 }
 function claimedAgentGraphIntentRequestFingerprint(input) {
@@ -3491,7 +3531,8 @@ function claimedAgentGraphIntentResult(claim, result) {
 function sessionConfigurationWithPermissionMode(header, permissionMode) {
     return {
         backend: header.backend,
-        ...(header.llmConnectionId === undefined ? {} : { llmConnectionId: header.llmConnectionId }),
+        executorId: header.executorId,
+        llmConnectionId: header.llmConnectionId,
         llmConnectionSlug: header.llmConnectionSlug,
         connectionLocked: header.connectionLocked,
         model: header.model,
@@ -3503,6 +3544,7 @@ function sessionConfigurationWithPermissionMode(header, permissionMode) {
 }
 function sessionConfigurationMatchesExceptPermissionMode(header, configuration) {
     return (header.backend === configuration.backend &&
+        header.executorId === configuration.executorId &&
         header.llmConnectionId === configuration.llmConnectionId &&
         header.llmConnectionSlug === configuration.llmConnectionSlug &&
         header.connectionLocked === configuration.connectionLocked &&

package/node_modules/@maka/runtime/dist/shell-run-manager.js

@@ -736,6 +736,7 @@ export class ShellRunProcessManager {
     async markRunning(live) {
         live.record = await this.input.store.updateShellRun(live.sessionId, live.shellRunId, {
             status: 'running',
+            ...this.processPidPatch(live),
             output: (await this.snapshotAtCut(live, false)).output,
             updatedAt: this.input.now(),
         });
@@ -746,6 +747,10 @@ export class ShellRunProcessManager {
             this.scheduleAutomaticFlush(live);
         }
     }
+    processPidPatch(live) {
+        const pid = live.driver.pid;
+        return pid !== undefined && Number.isSafeInteger(pid) && pid > 0 ? { pid } : {};
+    }
     onPipeData(live, stream, data) {
         if (live.driverExit || live.finalizeOnce)
             return;
@@ -894,12 +899,13 @@ export class ShellRunProcessManager {
             if (live.persistFailure && !options.bestEffort)
                 throw live.persistFailure;
             const current = live.record;
-            const candidate = { ...current, ...patch, output: snapshot.output };
+            // ConPTY can publish its PID after admission, even without new output.
+            const update = { ...patch, ...this.processPidPatch(live), output: snapshot.output };
+            const candidate = { ...current, ...update };
             let updated = current;
             if (!isDeepStrictEqual(candidate, current)) {
                 updated = await this.input.store.updateShellRun(live.sessionId, live.shellRunId, {
-                    ...patch,
-                    output: snapshot.output,
+                    ...update,
                     updatedAt: this.input.now(),
                 });
                 live.record = updated;

package/node_modules/@maka/runtime/dist/shell-run-tool-result.js

@@ -107,6 +107,7 @@ function shellRunStateContent(record) {
         cmd: record.command,
         startedAt: record.startedAt,
         updatedAt: record.updatedAt,
+        ...(record.pid !== undefined ? { pid: record.pid } : {}),
         ...(record.completedAt !== undefined ? { completedAt: record.completedAt } : {}),
         ...(record.timeoutMs !== undefined ? { timeoutMs: record.timeoutMs } : {}),
         ...(record.exitCode !== undefined ? { exitCode: record.exitCode } : {}),

package/node_modules/@maka/runtime/dist/stream-graph-schedule-reconcile.js

@@ -637,6 +637,7 @@ function buildOperatorProvisionInput(topology, observation, work, source, expect
         ...(work.target.kind === 'preset'
             ? { subagentId: work.target.presetId }
             : { agentId: work.target.agentId }),
+        ...(work.target.executorId ? { executorId: work.target.executorId } : {}),
         operatorId,
         source,
         edges,

package/node_modules/@maka/runtime/dist/stream-graph-supervisor-tools.js

@@ -17,6 +17,7 @@
  * under the License.
  */
 import { z } from 'zod';
+import { isExecutorId } from '@maka/core/executor-id';
 import { AGENT_GRAPH_SCHEDULE_MAX_ADD_WORK, AGENT_GRAPH_SCHEDULE_MAX_INPUT_IDS, AGENT_GRAPH_SCHEDULE_MAX_INSTRUCTION_CHARS, AGENT_GRAPH_SCHEDULE_MAX_REASON_CHARS, AGENT_GRAPH_SCHEDULE_MAX_RESULT_IDS, AGENT_GRAPH_SCHEDULE_MAX_SELECTED_RESULT_INPUTS, AGENT_GRAPH_SCHEDULE_MAX_STOP, AGENT_GRAPH_SCHEDULE_UPDATE_SCHEMA_VERSION, decodeAgentGraphScheduleUpdate, } from '@maka/core/agent-graph-schedule';
 import { stableHash } from './request-shape.js';
 export const VIEW_AGENT_GRAPH_TOOL_NAME = 'view_agent_graph';
@@ -35,6 +36,7 @@ const identitySchema = z
     .min(1)
     .max(256)
     .refine((value) => !/[\u0000-\u001f\u007f]/.test(value), 'Identity contains control characters');
+const executorIdSchema = z.string().refine(isExecutorId, 'Invalid plugin executor id');
 const cursorSchema = z
     .string()
     .trim()
@@ -56,6 +58,9 @@ const addWorkSchema = z.preprocess(cleanAddWorkInput, z
     operator_id: identitySchema
         .optional()
         .describe('Runtime id of an EXISTING graph operator returned by view_agent_graph. Use only for follow-up work; set operator_id OR agent_id, never both.'),
+    executor_id: executorIdSchema
+        .optional()
+        .describe('Plugin executor id for a newly created agent or preset target.'),
     instruction: z.string().trim().min(1).max(AGENT_GRAPH_SCHEDULE_MAX_INSTRUCTION_CHARS),
     input_ids: z
         .array(identitySchema)
@@ -245,6 +250,7 @@ function cleanAddWorkInput(input) {
     if (cleaned.target_kind === 'existing_operator') {
         delete cleaned.agent_id;
         delete cleaned.subagent_id;
+        delete cleaned.executor_id;
     }
     if (cleaned.replacement_mode === 'none')
         delete cleaned.replaces;
@@ -696,10 +702,18 @@ function assertGraphObservation(graphId, observation) {
 }
 function normalizeWorkTarget(input) {
     if (input.target_kind === 'new_agent') {
-        return { kind: 'agent', agentId: requireIdentity(input.agent_id, 'agent id') };
+        return {
+            kind: 'agent',
+            agentId: requireIdentity(input.agent_id, 'agent id'),
+            ...(input.executor_id ? { executorId: input.executor_id } : {}),
+        };
     }
     if (input.target_kind === 'new_preset') {
-        return { kind: 'preset', presetId: requireIdentity(input.subagent_id, 'subagent preset id') };
+        return {
+            kind: 'preset',
+            presetId: requireIdentity(input.subagent_id, 'subagent preset id'),
+            ...(input.executor_id ? { executorId: input.executor_id } : {}),
+        };
     }
     if (input.target_kind === 'existing_operator') {
         return {
@@ -712,10 +726,18 @@ function normalizeWorkTarget(input) {
         throw new Error('Exactly one of subagent_id, agent_id, or operator_id is required');
     }
     if (input.subagent_id) {
-        return { kind: 'preset', presetId: requireIdentity(input.subagent_id, 'subagent preset id') };
+        return {
+            kind: 'preset',
+            presetId: requireIdentity(input.subagent_id, 'subagent preset id'),
+            ...(input.executor_id ? { executorId: input.executor_id } : {}),
+        };
     }
     return input.agent_id
-        ? { kind: 'agent', agentId: requireIdentity(input.agent_id, 'agent id') }
+        ? {
+            kind: 'agent',
+            agentId: requireIdentity(input.agent_id, 'agent id'),
+            ...(input.executor_id ? { executorId: input.executor_id } : {}),
+        }
         : { kind: 'operator', operatorId: requireIdentity(input.operator_id, 'operator id') };
 }
 function normalizeUniqueIdentities(values, name) {

package/node_modules/@maka/runtime/dist/subagent-tools.js

@@ -17,6 +17,7 @@
  * under the License.
  */
 import { z } from 'zod';
+import { isExecutorId } from '@maka/core/executor-id';
 import { decodeCanonicalToolResultContent } from '@maka/core/tool-result-record-schema';
 import { isSafeSubagentPresetId } from '@maka/core/subagent-settings';
 import { AGENT_WORKSPACE_SAME_WORKSPACE, AGENT_WORKSPACE_WORKTREE, AGENT_WRITE_BACK_PATCH, AGENT_WRITE_BACK_SUMMARY, BUILTIN_AGENT_DEFINITIONS, agentProfilesForDefinitions, buildToolsForAgentDefinition, requireAgentDefinitionByProfile, } from './agent-catalog.js';
@@ -86,6 +87,11 @@ export function buildSubagentSpawnTool(deps = {}) {
                 .refine(isSafeSubagentPresetId)
                 .optional()
                 .describe('User-approved subagent preset id from agent_list.'),
+            executor_id: z
+                .string()
+                .refine(isExecutorId)
+                .optional()
+                .describe('Plugin executor id for this child task.'),
             task: z
                 .string()
                 .min(1)
@@ -158,6 +164,7 @@ export function buildSubagentSpawnTool(deps = {}) {
                 result = projectSubagentToolResult(await ctx.spawnChildSession({
                     agentProfile: definition.profile,
                     ...(input.subagent_id ? { subagentId: input.subagent_id } : {}),
+                    ...(input.executor_id ? { executorId: input.executor_id } : {}),
                     prompt: input.task,
                     onEvent: (event) => progress.observe(event),
                 }));