fix: preserve queued skill invocation outcomes

apps/desktop/src/main/__tests__/runtime-host-client-uds.test.ts

@@ -76,7 +76,14 @@ test('drives Desktop Session operations through a real Runtime Host connection',
                 },
           'turn.message.submit': async (input) => {
             assert.equal(input.originHostEpoch, hostEpoch);
-            return { ok: true, result: { disposition: 'steering', queueRevision: 1 } };
+            return {
+              ok: true,
+              result: {
+                disposition: 'steering',
+                queueRevision: 1,
+                skillInvocation: { loaded: [], failed: [], receipts: [] },
+              },
+            };
           },
         }),
         beginDrain() {},
@@ -107,7 +114,11 @@ test('drives Desktop Session operations through a real Runtime Host connection',
         content: { text: 'Continue with the new constraints.' },
         placement: 'current_turn',
       }),
-      { disposition: 'steering', queueRevision: 1 },
+      {
+        disposition: 'steering',
+        queueRevision: 1,
+        skillInvocation: { loaded: [], failed: [], receipts: [] },
+      },
     );
 
     await client.close();

apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts

@@ -369,7 +369,11 @@ test("sends canonical content and uploads owned Attachment bytes through the Hos
     },
     submitMessage: async (input) => {
       starts.push(input);
-      return { disposition: "turn_started", turnId: "turn-1" };
+      return {
+        disposition: "turn_started",
+        turnId: "turn-1",
+        skillInvocation: { loaded: [], failed: [], receipts: [] },
+      };
     },
   });
   const ipc = ipcHarness();
@@ -474,7 +478,11 @@ test("uploads a selected workspace file as a Host-owned Session Artifact", async
         },
         submitMessage: async (input) => {
           starts.push(input);
-          return { disposition: "turn_started", turnId: "turn-1" };
+          return {
+            disposition: "turn_started",
+            turnId: "turn-1",
+            skillInvocation: { loaded: [], failed: [], receipts: [] },
+          };
         },
       }),
       observer: unusedObserver(),
@@ -574,7 +582,11 @@ test("submits an ordinary composer message once under its stable message identit
         getSession: async () => session(),
         submitMessage: async (input) => {
           submits.push(input);
-          return { disposition: "turn_started", turnId: "host-turn" };
+          return {
+            disposition: "turn_started",
+            turnId: "host-turn",
+            skillInvocation: { loaded: [], failed: [], receipts: [] },
+          };
         },
       }),
       observer: unusedObserver(),
@@ -726,14 +738,19 @@ test('submits a slash Skill message and reports the Host Skill outcome', async (
 test("queues a mid-turn send as steering when the Host reports the session busy", async () => {
   const submits: unknown[] = [];
   const changes: unknown[] = [];
+  const skillInvocation = {
+    loaded: [{ id: 'review', name: 'Review' }],
+    failed: [{ request: 'typo', reason: 'not_found' as const }],
+    receipts: [],
+  };
   const ipc = ipcHarness();
   registerExecutionIpc(
     {
       client: executionClient({
         getSession: async () => session(),
         submitMessage: async (input) => {
           submits.push(input);
-          return { disposition: "steering", queueRevision: 1 };
+          return { disposition: "steering", queueRevision: 1, skillInvocation };
         },
       }),
       observer: unusedObserver(),
@@ -768,7 +785,7 @@ test("queues a mid-turn send as steering when the Host reports the session busy"
     turnId: "turn-1",
     attachments: [],
     inlineReferences: [],
-    skillInvocation: { loaded: [], failed: [], receipts: [] },
+    skillInvocation,
   });
   assert.deepEqual(changes, [
     { reason: "status-change", sessionId: "session-1" },
@@ -852,7 +869,11 @@ test("retries a dispatched send with its original message identity", async () =>
               "connection_lost",
             );
           }
-          return { disposition: "steering", queueRevision: 1 };
+          return {
+            disposition: "steering",
+            queueRevision: 1,
+            skillInvocation: { loaded: [], failed: [], receipts: [] },
+          };
         },
       }),
       newId: () => "id-1",
@@ -931,6 +952,7 @@ test("answers a send with the Turn the Host started for it", async () => {
           return {
             disposition: "turn_started",
             turnId: "turn-9",
+            skillInvocation: { loaded: [], failed: [], receipts: [] },
           };
         },
       }),
@@ -1028,7 +1050,11 @@ test("lets the Host queue a textual Skill token as steering", async () => {
         getSession: async () => session(),
         submitMessage: async (input) => {
           submits.push(input);
-          return { disposition: "steering", queueRevision: 1 };
+          return {
+            disposition: "steering",
+            queueRevision: 1,
+            skillInvocation: { loaded: [], failed: [], receipts: [] },
+          };
         },
       }),
       newId: () => "id-1",
@@ -1099,14 +1125,19 @@ test("reports a Host-blocked Skill send as a Skill failure", async () => {
 test("queues explicit Desktop follow-ups", async () => {
   const submits: unknown[] = [];
   let sequence = 0;
+  const skillInvocation = {
+    loaded: [{ id: 'writer', name: 'Writer' }],
+    failed: [{ request: 'missing', reason: 'not_found' as const }],
+    receipts: [],
+  };
   const ipc = ipcHarness();
   registerExecutionIpc(
     {
       client: executionClient({
         getSession: async () => session(),
         submitMessage: async (input) => {
           submits.push(input);
-          return { disposition: "followup", queueRevision: 4 };
+          return { disposition: "followup", queueRevision: 4, skillInvocation };
         },
       }),
       observer: unusedObserver(),
@@ -1156,7 +1187,7 @@ test("queues explicit Desktop follow-ups", async () => {
         },
       ],
       inlineReferences: [],
-      skillInvocation: { loaded: [], failed: [], receipts: [] },
+      skillInvocation,
     },
   );
   assert.deepEqual(submits, [
@@ -1325,7 +1356,11 @@ test("binds steer and stop to Host-owned queue and active Turn identities", asyn
           'Message disposition cannot be proven in this Host Epoch',
         );
       }
-      return { disposition: "steering", queueRevision: 2 };
+      return {
+        disposition: "steering",
+        queueRevision: 2,
+        skillInvocation: { loaded: [], failed: [], receipts: [] },
+      };
     },
     interruptTurn: async (input) => {
       stopLifecycle.push("interrupt");

apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts

@@ -385,7 +385,7 @@ export function registerRuntimeHostSessionExecutionIpc(
           turnId: submitted.turnId,
           attachments,
           inlineReferences,
-          skillInvocation: submitted.skillInvocation ?? EMPTY_SKILL_INVOCATION,
+          skillInvocation: submitted.skillInvocation,
         };
       }
       // The sending surface believed this Session idle; nudge it to refresh so
@@ -398,7 +398,7 @@ export function registerRuntimeHostSessionExecutionIpc(
         ...(sideConversation ? { messageId } : {}),
         attachments,
         inlineReferences,
-        skillInvocation: EMPTY_SKILL_INVOCATION,
+        skillInvocation: submitted.skillInvocation,
       };
     },
   );
@@ -500,7 +500,7 @@ export function registerRuntimeHostSessionExecutionIpc(
           turnId: result.turnId,
           attachments,
           inlineReferences,
-          skillInvocation: result.skillInvocation ?? EMPTY_SKILL_INVOCATION,
+          skillInvocation: result.skillInvocation,
         };
       }
       // The submitting surface believed this Session idle when it steered;
@@ -511,7 +511,7 @@ export function registerRuntimeHostSessionExecutionIpc(
         disposition: result.disposition,
         attachments,
         inlineReferences,
-        skillInvocation: EMPTY_SKILL_INVOCATION,
+        skillInvocation: result.skillInvocation,
       };
     },
   );

packages/cli/src/__tests__/pi-tui-runner.test.ts

@@ -6045,6 +6045,44 @@ describe('Maka Pi TUI runner', () => {
     }
   });
 
+  test('shows partial Skill feedback when the Host queues the Message', async () => {
+    const terminal = new FakeTerminal();
+    const driver = new HostSkillDriver(
+      {
+        loaded: [{ id: 'alpha', name: 'Alpha' }],
+        failed: [{ request: 'typo', reason: 'not_found' }],
+        receipts: [],
+      },
+      'steering',
+    );
+    const run = runMakaPiTui({
+      title: 'Maka',
+      driver,
+      cwd: '/repo',
+      model: 'claude-sonnet-4-5',
+      connectionSlug: 'claude-subscription',
+      permissionMode: 'ask',
+      terminal,
+      listSkills: async () => [],
+    });
+
+    terminal.input('/skill:alpha /skill:typo 帮我整理');
+    terminal.input('\r');
+    await waitFor(() => driver.prompts.length === 1);
+    await waitFor(() => {
+      const output = plainTerminalOutput(terminal.output());
+      return output.includes('已加载技能：Alpha') && output.includes('/skill:typo（未找到）');
+    });
+
+    exitMaka(terminal);
+    await Promise.race([
+      run,
+      delay(CLOSE_BUDGET_MS).then(() => {
+        throw new Error('TUI did not close during test cleanup');
+      }),
+    ]);
+  });
+
   test('does not create a turn when every skill token fails to resolve', async () => {
     {
       const terminal = new FakeTerminal();
@@ -9085,7 +9123,10 @@ class RejectingUserCommandStopDriver extends RunningUserCommandDriver {
 }
 
 class HostSkillDriver extends SlashCommandDriver {
-  constructor(private readonly skillInvocation: SkillInvocationResult) {
+  constructor(
+    private readonly skillInvocation: SkillInvocationResult,
+    private readonly admittedDisposition: 'turn_started' | 'steering' = 'turn_started',
+  ) {
     super();
   }
 
@@ -9106,6 +9147,9 @@ class HostSkillDriver extends SlashCommandDriver {
     // Admitted: the receipt for what was resolved rides the answer, which is
     // the client's only sight of it.
     const admitted = await super.submitMessage(text, options);
+    if (this.admittedDisposition === 'steering') {
+      return { disposition: 'steering', queueRevision: 1, skillInvocation: this.skillInvocation };
+    }
     return admitted?.disposition === 'turn_started'
       ? { ...admitted, skillInvocation: this.skillInvocation }
       : admitted;
@@ -9904,7 +9948,11 @@ async function admitMessageAsTurn(
       summary: { ...fakeSessionSummary(turn.sessionId), ...driver.hostSummary },
     }),
   );
-  return { disposition: 'turn_started', turnId: turn.turnId };
+  return {
+    disposition: 'turn_started',
+    turnId: turn.turnId,
+    skillInvocation: { loaded: [], failed: [], receipts: [] },
+  };
 }
 
 function fakeSessionSummary(

packages/cli/src/pi-tui-runner.ts

@@ -1095,7 +1095,7 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise<void> {
         // was dropped, and the submit answer is the only place it appears: the
         // Turn arrives through the started-Turn subscription, which carries
         // Session state rather than this Message's admission.
-        if (result?.disposition === 'turn_started' && result.skillInvocation) {
+        if (result) {
           const { loaded, failed } = result.skillInvocation;
           if (loaded.length > 0 || failed.length > 0) showSkillInvocation(result.skillInvocation);
         }

packages/runtime-host/src/__tests__/canonical-session-projection.test.ts

@@ -597,7 +597,11 @@ function createMessages(
     startFromMessage: async () => {
       throw new Error('unexpected root start');
     },
-    prepareMessage: async (input) => ({ kind: 'ready', content: input.content }),
+    prepareMessage: async (input) => ({
+      kind: 'ready',
+      content: input.content,
+      skillInvocation: { loaded: [], failed: [], receipts: [] },
+    }),
     claimStop: async () => {
       throw new Error('unexpected root stop');
     },

packages/runtime-host/src/__tests__/fixtures/execution-host-suite.ts

@@ -711,6 +711,7 @@ export class ExecutionFixture {
         submittedPlacement: 'current_turn',
         placement: 'current_turn',
         disposition: 'steering',
+        skillInvocation: { loaded: [], failed: [], receipts: [] },
         admittedAt,
       });
       const result = await stores.agentRunStore.admitRootTurn({