@meistrari/agent-core 0.1.2 → 0.1.3

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@meistrari/agent-core",
     "type": "module",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "packageManager": "bun@1.3.12",
     "description": "Shared contracts and runtime modules for Tela coding-agent sandboxes: agent protocol, supervisor wire protocol, resident supervisor, worker runtime client, and Claude/Codex harness adapters.",
     "license": "UNLICENSED",

package/src/agents/claude/claude-event-mapper.ts

@@ -111,6 +111,7 @@ export interface ClaudeEventMapperState {
     interrupt: { status: 'none' } | { status: 'requesting' | 'accepted', turnId: string }
     sessionState?: 'running' | 'idle'
     currentTurnId?: string
+    currentCommandId?: string
     currentMessageId?: string
     currentCompactionId?: string
 }
@@ -213,6 +214,7 @@ export function mapClaudeMessage(message: SDKMessage, state: ClaudeEventMapperSt
         state.turnStarted = false
         state.interrupt = { status: 'none' }
         state.currentTurnId = undefined
+        state.currentCommandId = undefined
         state.currentMessageId = undefined
         state.currentCompactionId = undefined
         return drafts
@@ -522,7 +524,7 @@ function ensureTurnStarted(drafts: AgentEventDraft[], state: ClaudeEventMapperSt
     state.currentTurnId = createRuntimeTurnId()
     state.currentMessageId = undefined
     state.contentBlockTypeByIndex.clear()
-    drafts.push({ type: 'turn.started', turnId: state.currentTurnId, actor: mainActor, payload: {} })
+    drafts.push({ type: 'turn.started', turnId: state.currentTurnId, actor: mainActor, payload: removeUndefined({ commandId: state.currentCommandId }) })
     ensureSessionRunning(drafts, state)
     return state.currentTurnId
 }

package/src/agents/claude/claude-run.ts

@@ -95,6 +95,7 @@ export class ClaudeRun implements AgentRun {
     private finished = false
     private interruptRequest?: { turnId: string, promise: Promise<void> }
     private readonly acceptanceWaiters = new Map<string, AcceptanceWaiter>()
+    private readonly commandByClientMessageId = new Map<string, string>()
 
     constructor({ metadata, query, userInputRequests, input, eventMapperState, init }: ClaudeRunInput) {
         this.metadata = metadata
@@ -164,6 +165,7 @@ export class ClaudeRun implements AgentRun {
         // and a receipt with no registered waiter would be lost.
         const clientMessageId = deriveMessageId(command.commandId)
         const receipt = this.registerAcceptanceWaiter(clientMessageId)
+        this.commandByClientMessageId.set(clientMessageId, command.commandId)
         try {
             await this.deliverInput(message)
             // `submitted` requires the provider's positive acceptance receipt — the pinned
@@ -257,6 +259,7 @@ export class ClaudeRun implements AgentRun {
             }))
         }
         this.acceptanceWaiters.clear()
+        this.commandByClientMessageId.clear()
         this.events.push({ type: 'session.ended', payload: error ? { reason, error } : { reason } })
         this.events.push({ type: 'session.state.changed', payload: { state: reason === 'failed' ? 'failed' : 'stopped' } })
         this.events.end()
@@ -306,8 +309,17 @@ export class ClaudeRun implements AgentRun {
             this.acceptanceWaiters.get(parsed.data.command_uuid)?.reject(new AgentDeliveryUnknownError({
                 message: `Claude command ended as ${parsed.data.state} before acceptance was observed.`,
             }))
+            this.commandByClientMessageId.delete(parsed.data.command_uuid)
             return
         }
+        // A queued receipt acknowledges admission, not turn ownership. Keep the
+        // mapping after acceptance settles: the provider's started receipt is
+        // the authority for the next root turn, even with several queued inputs.
+        if (parsed.data.state === 'started') {
+            this.eventMapperState.currentCommandId = this.commandByClientMessageId.get(parsed.data.command_uuid)
+        }
+        if (parsed.data.state === 'completed')
+            this.commandByClientMessageId.delete(parsed.data.command_uuid)
         this.acceptanceWaiters.get(parsed.data.command_uuid)?.resolve()
     }
 

package/src/agents/codex/codex-event-mapper.ts

@@ -399,8 +399,10 @@ function hookPromptText(item: CodexHookPromptItem): string | undefined {
 }
 
 function commandExecutionResult(item: Extract<CodexCompletedItem, { type: 'commandExecution' }>, status: 'completed' | 'failed'): AgentToolResult | undefined {
-    const text = optionalNonEmpty(item.aggregatedOutput ?? undefined)
-    if (!text)
+    // Stdout is content, not a label: whitespace and an explicitly empty
+    // successful output must survive normalization into the complete step.
+    const text = item.aggregatedOutput
+    if (typeof text !== 'string')
         return undefined
 
     return { success: status === 'completed', content: [{ type: 'text', text }] }

package/src/protocol/agent-event.ts

@@ -135,7 +135,7 @@ export const sessionEndedAgentEventSchema = agentEventBaseSchema.extend({
 
 export const turnStartedAgentEventSchema = agentTurnEventBaseSchema.extend({
     type: z.literal('turn.started'),
-    payload: z.object({}).strict(),
+    payload: z.object({ commandId: z.string().min(1).optional() }).strict(),
 }).strict()
 
 export const turnEndedAgentEventSchema = agentTurnEventBaseSchema.extend({

package/src/provenance.gen.ts

@@ -1,6 +1,6 @@
 // Generated by scripts/write-provenance.ts. Do not edit by hand.
 export const generatedProvenance = {
-    version: "0.1.2",
-    sha: "85081b3dd3667033dfb1dfd399a6f59d3fd42d43",
-    buildTime: "2026-09-09T11:47:21.679Z",
+    version: "0.1.3",
+    sha: "8b997b992439bb6300854fed35d461ca0fdbd3e2",
+    buildTime: "2026-09-09T19:31:26.657Z",
 } as const

package/src/steps/projector.ts

@@ -23,6 +23,15 @@ export class DurableStepProjector {
         this.db.exec(`pragma journal_mode=WAL; pragma synchronous=FULL;
             create table if not exists steps(id text primary key, body text not null, last_event_id text);
             create table if not exists journal(id text primary key, event text, frames text);
+            create table if not exists turn_commands(
+                session_id text not null, provider_session_id text not null,
+                actor_id text not null, turn_id text not null, command_id text not null,
+                primary key(session_id, provider_session_id, actor_id, turn_id)
+            );
+            create index if not exists steps_tool_command on steps(
+                json_extract(body,'$.sessionId'), json_extract(body,'$.actor.actorId'),
+                json_extract(body,'$.kind'), json_extract(body,'$.sourceId')
+            );
         `)
         if (!this.db.query<{ name: string }, []>('pragma table_info(steps)').all().some(column => column.name === 'last_event_id'))
             this.db.exec('alter table steps add column last_event_id text')
@@ -76,6 +85,7 @@ export class DurableStepProjector {
     }
 
     private async project(event: AgentEvent): Promise<WireEventBody[]> {
+        const commandId = this.correlateCommand(event)
         const kind = event.type.startsWith('message.')
             ? 'message'
             : event.type.startsWith('tool.call.')
@@ -86,6 +96,8 @@ export class DurableStepProjector {
             if (event.type === 'turn.ended' || event.type === 'session.ended') {
                 for (const row of this.db.query<{ body: string, last_event_id: string | null }, []>('select body, last_event_id from steps').all()) {
                     const step = JSON.parse(row.body) as StepDetailV1
+                    if (step.sessionId !== event.sessionId || step.providerSessionId !== event.providerSessionId)
+                        continue
                     if ((step.status !== 'running' && row.last_event_id !== event.eventId) || (event.type === 'turn.ended' && (step.turnId !== event.turnId || step.actor.actorId !== event.actor.actorId)))
                         continue
                     step.status = event.type === 'turn.ended' && event.payload.status === 'failed' ? 'failed' : 'interrupted'
@@ -109,7 +121,7 @@ export class DurableStepProjector {
                     stepId,
                     version: 1,
                     provider: event.provider,
-                    commandId: typeof payload.commandId === 'string' ? payload.commandId : null,
+                    commandId,
                     role: kind === 'message' ? payload.role as StepSummary['role'] : null,
                     toolName: typeof payload.toolName === 'string' ? payload.toolName : null,
                     status: 'running',
@@ -121,6 +133,7 @@ export class DurableStepProjector {
                 }
         if (step.status !== 'running' && row?.last_event_id !== event.eventId)
             return []
+        step.commandId ??= commandId
         if (event.type.endsWith('started')) {
             if (row && row.last_event_id !== event.eventId)
                 return []
@@ -158,12 +171,16 @@ export class DurableStepProjector {
     }
 
     private async finish(step: StepDetailV1): Promise<WireEventBody[]> {
+        // The provider can correlate a turn after its first content start. A
+        // terminal fact must resolve that binding too, not only normal closes.
+        step.commandId ??= this.correlateCommand(step)
         if (step.kind === 'message') {
             // References, not repeated complete tool payloads, connect message content.
-            step.content.toolSteps = this.db.query<{ id: string }, [string, string]>(`
+            step.content.toolSteps = this.db.query<{ id: string }, [string, string, string, string]>(`
                 select id from steps where json_extract(body,'$.kind')='tool'
+                and json_extract(body,'$.sessionId')=? and json_extract(body,'$.providerSessionId')=?
                 and json_extract(body,'$.turnId')=? and json_extract(body,'$.actor.actorId')=? order by rowid
-            `).all(step.turnId, step.actor.actorId).map(row => row.id)
+            `).all(step.sessionId, step.providerSessionId, step.turnId, step.actor.actorId).map(row => row.id)
         }
         this.save(step)
         const body = serializeStepDetail(step)
@@ -179,6 +196,39 @@ export class DurableStepProjector {
         ]
     }
 
+    private correlateCommand(event: AgentEvent | StepDetailV1): string | null {
+        if (!('turnId' in event))
+            return null
+        const key = [event.sessionId, event.providerSessionId, event.actor.actorId, event.turnId] as const
+        const previous = this.db.query<{ command_id: string }, [string, string, string, string]>(
+            'select command_id from turn_commands where session_id=? and provider_session_id=? and actor_id=? and turn_id=?',
+        ).get(...key)?.command_id
+        const payload = 'payload' in event ? event.payload as Record<string, unknown> : event
+        const explicit = typeof payload.commandId === 'string' ? payload.commandId : undefined
+        if (previous && explicit && previous !== explicit)
+            throw new Error('Conflicting command identity for a provider turn.')
+        let inherited: string | undefined
+        if (!previous && !explicit && event.actor.type === 'subagent') {
+            const toolCallId = event.actor.parentToolCallId
+                ?? (event.actor.origin.type === 'tool_call' ? event.actor.origin.toolCallId : undefined)
+            if (toolCallId) {
+                const parents = this.db.query<{ command_id: string }, [string, string, string]>(`
+                    select distinct json_extract(body,'$.commandId') as command_id from steps
+                    where json_extract(body,'$.sessionId')=? and json_extract(body,'$.actor.actorId')=?
+                    and json_extract(body,'$.kind')='tool' and json_extract(body,'$.sourceId')=?
+                    and json_extract(body,'$.commandId') is not null limit 2
+                `).all(event.sessionId, event.actor.parentActorId, toolCallId)
+                if (parents.length === 1)
+                    inherited = parents[0]!.command_id
+            }
+        }
+        const commandId = previous ?? explicit ?? inherited
+        if (commandId && !previous) {
+            this.db.query('insert into turn_commands values (?,?,?,?,?)').run(...key, commandId)
+        }
+        return commandId ?? null
+    }
+
     private save(step: StepDetailV1): void {
         this.db.query('insert into steps(id,body,last_event_id) values (?,?,?) on conflict(id) do update set body=excluded.body,last_event_id=excluded.last_event_id')
             .run(step.stepId, JSON.stringify(step), this.currentEventId)