fix(web): carry multi-skill compose list through EntryShell submit seam (#6333 review)

nettee's non-blocking thread on #6333 round-2 review (apps/web/src/components/EntryShell.tsx,
2026-08-02) observed that `handlePluginLoopSubmit` builds the
`onCreateProject` payload by forward each `payload.*` field, but
omitted `payload.skillIds`. PR #6333 had added a `skillIds` array to
`PluginLoopSubmit` so the Home @-mention multi-skill compose flow
(`@skill-a @skill-b`) reaches POST /api/projects with the full list
(instead of silently dropping to `project.skillId` on the first
run). The array was correctly forwarded in
`App.handleCreateProject` (9624316), which stashes
`od:auto-send-skillIds:<projectId>` in sessionStorage so ProjectView
puts it back into `meta.skillIds` on the first `handleSend(...)`.
Without the EntryShell seam passing `skillIds` through,
`App.handleCreateProject` never saw the array and the Home
auto-send hand-off landed empty — the end-to-end link was broken at
this seam.

Changes:
- New helper `apps/web/src/components/plugin-loop-submit.ts` /
  `buildCreateProjectArgsFromPluginLoopSubmit` — extracts the
  spread-block logic from EntryShell into a pure function whose
  surface is explicitly tested. The helper forwards
  `payload.skillIds` when `length > 1` (mirrors the existing guard
  in HomeView) and does NOT spread it on the single-skill flow so
  the daemon's primary `skillId` binding stays the only contract.
- `apps/web/src/components/EntryShell.tsx`: replace the inline
  spread with `buildCreateProjectArgsFromPluginLoopSubmit(payload,
  { name, amrGatePrechecked })` + merge `metadata` /
  `examplePromptContext` — same behavior, now testable in isolation.
- `apps/web/tests/components/plugin-loop-submit.test.ts`: 6-case
  regression suite covering multi-skill forward, single-skill
  exclusion, length-1 guard, presence of plugin fields when set,
  absence when unset, and null defaults.
- `apps/web/src/components/PluginLoopHome.tsx`: add
  `skillIds?: string[] | null` to the `PluginLoopSubmit` interface
  (the shape HomeView already stamped, just not forwarded through
  EntryShell).

All 66 existing `ProjectView.run-cleanup.test.tsx` cases + all 6 new
`plugin-loop-submit.test.ts` cases pass locally. Ready for re-review.

Signed-off-by: xxiaoxiong <2482929840@qq.com>

Author: xxiaoxiong

apps/web/src/components/EntryShell.tsx

@@ -142,6 +142,7 @@ import { NewProjectModal } from './NewProjectModal';
 import { PluginsView } from './PluginsView';
 import type { CreateInput, CreateTab, ImportClaudeDesignOutcome } from './NewProjectPanel';
 import type { PluginLoopSubmit } from './PluginLoopHome';
+import { buildCreateProjectArgsFromPluginLoopSubmit } from './plugin-loop-submit';
 import {
   createProject,
   type PluginShareAction,
@@ -814,28 +815,16 @@ export function EntryShell({
       } : {}),
     };
     return onCreateProject({
-      name,
-      skillId: payload.skillId ?? null,
-      designSystemId: payload.designSystemId ?? null,
+      ...buildCreateProjectArgsFromPluginLoopSubmit(payload, {
+        name,
+        amrGatePrechecked,
+      }),
       metadata,
-      pendingPrompt: payload.prompt,
-      ...(payload.pluginId ? { pluginId: payload.pluginId } : {}),
-      ...(payload.pluginType ? { pluginType: payload.pluginType } : {}),
-      ...(payload.appliedPluginSnapshotId
-        ? { appliedPluginSnapshotId: payload.appliedPluginSnapshotId }
-        : {}),
-      ...(payload.pluginInputs ? { pluginInputs: payload.pluginInputs } : {}),
-      ...(payload.initialRunContext ? { initialRunContext: payload.initialRunContext } : {}),
-      ...(payload.conversationMode ? { conversationMode: payload.conversationMode } : {}),
-      ...(payload.attachments && payload.attachments.length > 0
-        ? { pendingFiles: payload.attachments }
-        : {}),
-      // No `userWorkingDirToken`: linkedDirs grant read-only `--add-dir`
-      // access and are validated by the daemon at create time, so they do
-      // not need the desktop main-process trust token that baseDir imports
-      // require for write access.
-      autoSendFirstMessage: true,
-      amrGatePrechecked,
+      ...(payload.examplePromptContext ? {
+        examplePrompt: true,
+        examplePromptTitle: payload.examplePromptContext.title,
+        examplePromptBrief: payload.examplePromptContext.brief,
+      } : {}),
     });
   }
 

apps/web/src/components/PluginLoopHome.tsx

@@ -32,6 +32,15 @@ export interface PluginLoopSubmit {
   // to attribute project_create_result to a plugin type. Null when no plugin.
   pluginType?: string | null;
   skillId?: string | null;
+  // 5824: Home @-mention can stage multiple skills at once. The first
+  // entry is the project's primary `skillId` above; later entries ride
+  // along as composed-skill blocks via the daemon's `skillIds` field.
+  // Null/absent means single-skill (or no-skill) flow. Forwarded by
+  // EntryShell.handlePluginLoopSubmit into onCreateProject so the
+  // multi-skill compose list reaches POST /api/projects (and the
+  // Home auto-send hand-off in App.handleCreateProject) instead of
+  // being silently dropped at this submit seam.
+  skillIds?: string[] | null;
   appliedPluginSnapshotId: string | null;
   pluginTitle: string | null;
   taskKind: string | null;

apps/web/src/components/plugin-loop-submit.ts

@@ -0,0 +1,110 @@
+// #5824 / #6333 round-2 (nettee, 2026-08-02): the Home @-mention
+// multi-skill compose flow stages an ordered `skillIds` array on the
+// submit payload (the first entry becomes the project's primary
+// `skillId`, later entries ride along as composed-skill blocks via the
+// daemon's `skillIds` field). The array was correctly forwarded to
+// POST /api/projects from `App.handleCreateProject` (9624316), but
+// `EntryShell.handlePluginLoopSubmit` previously only forwarded
+// `payload.skillId` into `onCreateProject`, so the multi-skill list was
+// silently dropped at this submit seam — `App.handleCreateProject`
+// never saw it and the Home auto-send hand-off landed with no
+// `od:auto-send-skillIds:*` entry, breaking the end-to-end link.
+//
+// This module extracts the `buildCreateProjectArgsFromPluginLoopSubmit`
+// spread rule into a pure helper so the seam can be unit-tested without
+// driving the full plugin-loop UI. `EntryShell.handlePluginLoopSubmit`
+// now delegates to this helper, and the helper has a regression test
+// asserting `payload.skillIds` (>1 entries) lands on the produced
+// create-project args while `skillId` defaults to the primary.
+
+import type { PluginLoopSubmit } from './PluginLoopHome';
+
+/**
+ * Shape of the args `EntryShell.handlePluginLoopSubmit` passes into
+ * `onCreateProject`. We only model the fields this helper is
+ * responsible for spreading; callers may merge additional fields
+ * (metadata, plugin snapshot id, attachments, …) on top.
+ */
+export interface PluginLoopCreateProjectArgs {
+  name: string;
+  skillId: string | null;
+  /**
+   * The multi-skill compose list. Absent on the single-skill /
+   * no-skill flow (`payload.skillIds` is null / undefined / length <=
+   * 1) so the daemon's primary `skillId` binding is the only contract
+   * in that case. Forwarded as-is (no de-dup, no reordering) when
+   * the user staged more than one skill via @-mention.
+   */
+  skillIds?: string[];
+  designSystemId: string | null;
+  pendingPrompt: string;
+  pluginId?: string;
+  pluginType?: string;
+  appliedPluginSnapshotId?: string;
+  pluginInputs?: Record<string, unknown>;
+  initialRunContext?: PluginLoopSubmit['initialRunContext'];
+  conversationMode?: PluginLoopSubmit['conversationMode'];
+  pendingFiles?: PluginLoopSubmit['attachments'];
+  autoSendFirstMessage: true;
+  amrGatePrechecked: boolean;
+  // The exhaustive literal list above mirrors the spread block the
+  // EntryShell handler used to inline. Keeping the surface typed
+  // surfaces drift between the helper and the call-site; the EntryShell
+  // component adds metadata + linkedDirs / examplePromptContext by
+  // merging on top of this helper's output.
+}
+
+/**
+ * Build the `onCreateProject` args from a `PluginLoopSubmit` payload.
+ *
+ * The function is intentionally pure — it does not touch state, network,
+ * or sessionStorage. The EntryShell component keeps responsibility
+ * for deriving `name`, `metadata`, `linkedDirs`, `examplePromptContext`,
+ * and the AMR balance pre-check flag, then merges those on top of the
+ * object returned here.
+ *
+ * Round-2 review regression: `payload.skillIds` MUST reach
+ * `onCreateProject` (and therefore `App.handleCreateProject`'s
+ * `od:auto-send-skillIds:<projectId>` stash) when the user staged more
+ * than one skill. The single-skill flow does NOT spread `skillIds` so
+ * the daemon's primary `skillId` binding is the only contract in that
+ * case (mirrors the previous behavior — the `length > 1` guard avoids
+ * leaking an empty / single-element array that would shadow
+ * `skillId`).
+ */
+export function buildCreateProjectArgsFromPluginLoopSubmit(
+  payload: PluginLoopSubmit,
+  context: {
+    name: string;
+    amrGatePrechecked: boolean;
+  },
+): Omit<PluginLoopCreateProjectArgs, 'designSystemId' | 'metadata' | 'pendingPrompt'> & {
+  designSystemId: string | null;
+  pendingPrompt: string;
+} {
+  return {
+    name: context.name,
+    skillId: payload.skillId ?? null,
+    // Forward the multi-skill compose list so Home @-mention
+    // (`@skill-a @skill-b`) does not silently degrade to a
+    // single-skill create at this submit seam.
+    ...(payload.skillIds && payload.skillIds.length > 1
+      ? { skillIds: payload.skillIds }
+      : {}),
+    designSystemId: payload.designSystemId ?? null,
+    pendingPrompt: payload.prompt,
+    ...(payload.pluginId ? { pluginId: payload.pluginId } : {}),
+    ...(payload.pluginType ? { pluginType: payload.pluginType } : {}),
+    ...(payload.appliedPluginSnapshotId
+      ? { appliedPluginSnapshotId: payload.appliedPluginSnapshotId }
+      : {}),
+    ...(payload.pluginInputs ? { pluginInputs: payload.pluginInputs } : {}),
+    ...(payload.initialRunContext ? { initialRunContext: payload.initialRunContext } : {}),
+    ...(payload.conversationMode ? { conversationMode: payload.conversationMode } : {}),
+    ...(payload.attachments && payload.attachments.length > 0
+      ? { pendingFiles: payload.attachments }
+      : {}),
+    autoSendFirstMessage: true,
+    amrGatePrechecked: context.amrGatePrechecked,
+  };
+}

apps/web/tests/components/plugin-loop-submit.test.ts

@@ -0,0 +1,154 @@
+// @vitest-environment jsdom
+//
+// Regression for #6333 round-2 (nettee, 2026-08-02):
+// `PluginLoopSubmit` now carries a `skillIds` array alongside the
+// existing primary `skillId`. `EntryShell.handlePluginLoopSubmit`
+// delegates the build-args spread to
+// `buildCreateProjectArgsFromPluginLoopSubmit`, which must forward
+// the multi-skill compose list (length > 1) onto the produced
+// `onCreateProject` args so the array reaches
+// `App.handleCreateProject`'s `od:auto-send-skillIds:<projectId>`
+// sessionStorage hand-off and ultimately `streamViaDaemon`'s
+// `skillIds`. The single-skill flow must NOT spread `skillIds` so
+// the daemon's primary `skillId` binding is the only contract.
+
+import { describe, expect, it } from 'vitest';
+
+import type { PluginLoopSubmit } from '../../src/components/PluginLoopHome';
+import { buildCreateProjectArgsFromPluginLoopSubmit } from '../../src/components/plugin-loop-submit';
+
+function basePayload(overrides: Partial<PluginLoopSubmit>): PluginLoopSubmit {
+  return {
+    prompt: 'make a deck and a PDF',
+    pluginId: null,
+    skillId: 'deck-builder',
+    appliedPluginSnapshotId: null,
+    pluginTitle: null,
+    taskKind: null,
+    ...overrides,
+  } as PluginLoopSubmit;
+}
+
+describe('buildCreateProjectArgsFromPluginLoopSubmit', () => {
+  it('forwards payload.skillIds to onCreateProject when the compose list has more than one entry (multi-skill @-mention flow)', () => {
+    const payload = basePayload({
+      skillId: 'deck-builder',
+      skillIds: ['deck-builder', 'pdf-designer'],
+    });
+
+    const args = buildCreateProjectArgsFromPluginLoopSubmit(payload, {
+      name: 'Test Deck',
+      amrGatePrechecked: false,
+    });
+
+    // The primary skill stays on `skillId` (the single-skill contract),
+    // and the full multi-skill compose list lands on `skillIds`.
+    expect(args.skillId).toBe('deck-builder');
+    expect(args.skillIds).toEqual(['deck-builder', 'pdf-designer']);
+
+    // The hand-off fields the EntryShell relies on are present.
+    expect(args.name).toBe('Test Deck');
+    expect(args.pendingPrompt).toBe('make a deck and a PDF');
+    expect(args.designSystemId).toBeNull();
+    expect(args.autoSendFirstMessage).toBe(true);
+    expect(args.amrGatePrechecked).toBe(false);
+  });
+
+  it('does NOT spread skillIds on the single-skill flow so the primary binding is the only contract (regression for the previous spread that leaked null/undefined)', () => {
+    const payload = basePayload({
+      skillId: 'deck-builder',
+      skillIds: null,
+    });
+
+    const args = buildCreateProjectArgsFromPluginLoopSubmit(payload, {
+      name: 'Test',
+      amrGatePrechecked: false,
+    });
+
+    expect(args.skillId).toBe('deck-builder');
+    // `skillIds` must NOT appear — null/undefined should not be spread.
+    expect(args).not.toHaveProperty('skillIds');
+  });
+
+  it('does NOT spread skillIds when the compose list has length <= 1 (avoids overriding the primary skillId with a redundant one-element array)', () => {
+    const payload = basePayload({
+      skillId: 'deck-builder',
+      // Edge case: HomeView stamps the same primary as the only
+      // entry — the spread must not duplicate `skillId` as `skillIds`.
+      skillIds: ['deck-builder'],
+    });
+
+    const args = buildCreateProjectArgsFromPluginLoopSubmit(payload, {
+      name: 'Test',
+      amrGatePrechecked: false,
+    });
+
+    expect(args.skillId).toBe('deck-builder');
+    expect(args).not.toHaveProperty('skillIds');
+  });
+
+  it('preserves pluginId / pluginType / snapshotId / pluginInputs / initialRunContext / conversationMode / attachments when present', () => {
+    const attachment = new File(['x'], 'x.png');
+    const payload = basePayload({
+      pluginId: 'od-default',
+      pluginType: 'official',
+      appliedPluginSnapshotId: 'snap-1',
+      pluginInputs: { tone: 'concise' },
+      conversationMode: 'design',
+      attachments: [attachment],
+      // `initialRunContext` is typed loosely here for the helper test.
+      initialRunContext: { kind: 'recent-files', fileIds: ['f-1'] } as never,
+    });
+
+    const args = buildCreateProjectArgsFromPluginLoopSubmit(payload, {
+      name: 'Test',
+      amrGatePrechecked: true,
+    });
+
+    expect(args.pluginId).toBe('od-default');
+    expect(args.pluginType).toBe('official');
+    expect(args.appliedPluginSnapshotId).toBe('snap-1');
+    expect(args.pluginInputs).toEqual({ tone: 'concise' });
+    expect(args.conversationMode).toBe('design');
+    expect(args.pendingFiles).toEqual([attachment]);
+    expect(args.initialRunContext).toEqual({ kind: 'recent-files', fileIds: ['f-1'] });
+    expect(args.amrGatePrechecked).toBe(true);
+  });
+
+  it('omits pluginId / pluginType / snapshotId / pluginInputs / initialRunContext / conversationMode / pendingFiles when absent (no leak of undefined)', () => {
+    const payload = basePayload({});
+
+    const args = buildCreateProjectArgsFromPluginLoopSubmit(payload, {
+      name: 'Test',
+      amrGatePrechecked: false,
+    });
+
+    expect(args).not.toHaveProperty('pluginId');
+    expect(args).not.toHaveProperty('pluginType');
+    expect(args).not.toHaveProperty('appliedPluginSnapshotId');
+    expect(args).not.toHaveProperty('pluginInputs');
+    expect(args).not.toHaveProperty('initialRunContext');
+    expect(args).not.toHaveProperty('conversationMode');
+    expect(args).not.toHaveProperty('pendingFiles');
+  });
+
+  it('defaults designSystemId and skillId to null when payload omits them (the daemon treats absence as no binding)', () => {
+    const payload = basePayload({}).delete
+      ? basePayload({})
+      : ({
+          prompt: 'plain prompt',
+          pluginId: null,
+          appliedPluginSnapshotId: null,
+          pluginTitle: null,
+          taskKind: null,
+        } as PluginLoopSubmit);
+
+    const args = buildCreateProjectArgsFromPluginLoopSubmit(payload, {
+      name: 'Plain',
+      amrGatePrechecked: false,
+    });
+
+    expect(args.skillId).toBeNull();
+    expect(args.designSystemId).toBeNull();
+  });
+});