feat: 添加服务层增强与零散改进

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: unraid

src/assistant/__tests__/index.test.ts

@@ -0,0 +1,59 @@
+import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
+import { readFile, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import {
+  resetStateForTests,
+  setCwdState,
+  setOriginalCwd,
+} from '../../bootstrap/state'
+import { getTaskListId } from '../../utils/tasks'
+import { getTeamFilePath } from '../../utils/swarm/teamHelpers'
+import { initializeAssistantTeam } from '../index'
+
+let tempDir = ''
+let previousConfigDir: string | undefined
+
+beforeEach(() => {
+  previousConfigDir = process.env.CLAUDE_CONFIG_DIR
+  tempDir = join(
+    tmpdir(),
+    `assistant-team-${Date.now()}-${Math.random().toString(16).slice(2)}`,
+  )
+  process.env.CLAUDE_CONFIG_DIR = join(tempDir, 'config')
+  resetStateForTests()
+  setOriginalCwd(tempDir)
+  setCwdState(tempDir)
+})
+
+afterEach(async () => {
+  resetStateForTests()
+  if (previousConfigDir === undefined) {
+    delete process.env.CLAUDE_CONFIG_DIR
+  } else {
+    process.env.CLAUDE_CONFIG_DIR = previousConfigDir
+  }
+  await rm(tempDir, { recursive: true, force: true })
+})
+
+describe('initializeAssistantTeam', () => {
+  test('creates a session-scoped in-process team context and task list', async () => {
+    const context = await initializeAssistantTeam()
+    expect(context).toBeDefined()
+    const teamContext = context!
+
+    expect(teamContext.teamName).toStartWith('assistant-')
+    expect(teamContext.isLeader).toBe(true)
+    expect(teamContext.selfAgentName).toBe('team-lead')
+    expect(
+      teamContext.teammates[teamContext.leadAgentId]?.tmuxSessionName,
+    ).toBe('in-process')
+    expect(getTaskListId()).toBe(teamContext.teamName)
+
+    const raw = await readFile(getTeamFilePath(teamContext.teamName), 'utf-8')
+    const teamFile = JSON.parse(raw)
+    expect(teamFile.leadAgentId).toBe(teamContext.leadAgentId)
+    expect(teamFile.members[0].backendType).toBe('in-process')
+    expect(teamFile.members[0].agentType).toBe('assistant')
+  })
+})

src/assistant/index.ts

@@ -1,7 +1,24 @@
 import { readFileSync } from 'fs'
 import { join } from 'path'
-import { getKairosActive } from '../bootstrap/state.js'
+import { getKairosActive, getSessionId } from '../bootstrap/state.js'
+import type { AppState } from '../state/AppState.js'
+import { formatAgentId } from '../utils/agentId.js'
+import { getCwd } from '../utils/cwd.js'
 import { getClaudeConfigHomeDir } from '../utils/envUtils.js'
+import { TEAM_LEAD_NAME } from '../utils/swarm/constants.js'
+import {
+  getTeamFilePath,
+  registerTeamForSessionCleanup,
+  sanitizeName,
+  writeTeamFileAsync,
+  type TeamFile,
+} from '../utils/swarm/teamHelpers.js'
+import { assignTeammateColor } from '../utils/swarm/teammateLayoutManager.js'
+import {
+  ensureTasksDir,
+  resetTaskList,
+  setLeaderTeamName,
+} from '../utils/tasks.js'
 
 let _assistantForced = false
 
@@ -29,13 +46,67 @@ export function isAssistantForced(): boolean {
  * Pre-create an in-process team so Agent(name) can spawn teammates
  * without TeamCreate.
  *
- * Phase 1: returns undefined so main.tsx's `assistantTeamContext ?? computeInitialTeamContext()`
- * correctly falls back. Returning {} would bypass the ?? operator since {} is truthy.
- *
- * Phase 2: should return a full team context object matching AppState.teamContext shape.
+ * Creates a session-scoped assistant team file and returns a full team
+ * context object matching AppState.teamContext.
  */
-export async function initializeAssistantTeam(): Promise<undefined> {
-  return undefined
+export async function initializeAssistantTeam(): Promise<
+  AppState['teamContext']
+> {
+  const sessionId = getSessionId()
+  const teamName = sanitizeName(`assistant-${sessionId.slice(0, 8)}`)
+  const leadAgentId = formatAgentId(TEAM_LEAD_NAME, teamName)
+  const teamFilePath = getTeamFilePath(teamName)
+  const now = Date.now()
+  const cwd = getCwd()
+  const color = assignTeammateColor(leadAgentId)
+
+  const teamFile: TeamFile = {
+    name: teamName,
+    description: 'Assistant mode in-process team',
+    createdAt: now,
+    leadAgentId,
+    leadSessionId: sessionId,
+    members: [
+      {
+        agentId: leadAgentId,
+        name: TEAM_LEAD_NAME,
+        agentType: 'assistant',
+        color,
+        joinedAt: now,
+        tmuxPaneId: '',
+        cwd,
+        subscriptions: [],
+        backendType: 'in-process',
+      },
+    ],
+  }
+
+  await writeTeamFileAsync(teamName, teamFile)
+  registerTeamForSessionCleanup(teamName)
+  await resetTaskList(teamName)
+  await ensureTasksDir(teamName)
+  setLeaderTeamName(teamName)
+
+  return {
+    teamName,
+    teamFilePath,
+    leadAgentId,
+    selfAgentId: leadAgentId,
+    selfAgentName: TEAM_LEAD_NAME,
+    isLeader: true,
+    selfAgentColor: color,
+    teammates: {
+      [leadAgentId]: {
+        name: TEAM_LEAD_NAME,
+        agentType: 'assistant',
+        color,
+        tmuxSessionName: 'in-process',
+        tmuxPaneId: 'leader',
+        cwd,
+        spawnedAt: now,
+      },
+    },
+  }
 }
 
 /**

src/bridge/bridgeMain.ts

@@ -1963,7 +1963,6 @@ NOTES
   - You must be logged in with a Claude account that has a subscription
   - Run \`claude\` first in the directory to accept the workspace trust dialog
 ${serverNote}`
-  // biome-ignore lint/suspicious/noConsole: intentional help output
   console.log(help)
 }
 
@@ -2002,7 +2001,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     return
   }
   if (parsed.error) {
-    // biome-ignore lint/suspicious/noConsole: intentional error output
     console.error(`Error: ${parsed.error}`)
     // eslint-disable-next-line custom-rules/no-process-exit
     process.exit(1)
@@ -2041,7 +2039,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     const { PERMISSION_MODES } = await import('../types/permissions.js')
     const valid: readonly string[] = PERMISSION_MODES
     if (!valid.includes(permissionMode)) {
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: Invalid permission mode '${permissionMode}'. Valid modes: ${valid.join(', ')}`,
       )
@@ -2084,7 +2081,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
       Promise.all([shutdown1PEventLogging(), shutdownDatadog()]),
       sleep(500, undefined, { unref: true }),
     ]).catch(() => {})
-    // biome-ignore lint/suspicious/noConsole: intentional error output
     console.error(
       'Error: Multi-session Remote Control is not enabled for your account yet.',
     )
@@ -2101,7 +2097,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
   // The bridge bypasses main.tsx (which renders the interactive TrustDialog via showSetupScreens),
   // so we must verify trust was previously established by a normal `claude` session.
   if (!checkHasTrustDialogAccepted()) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(
       `Error: Workspace not trusted. Please run \`claude\` in ${dir} first to review and accept the workspace trust dialog.`,
     )
@@ -2118,7 +2113,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
 
   const bridgeToken = getBridgeAccessToken()
   if (!bridgeToken) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(BRIDGE_LOGIN_ERROR)
     // eslint-disable-next-line custom-rules/no-process-exit
     process.exit(1)
@@ -2137,7 +2131,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
       input: process.stdin,
       output: process.stdout,
     })
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(
       '\nRemote Control lets you access this CLI session from the web (claude.ai/code)\nor the Claude app, so you can pick up where you left off on any device.\n\nYou can disconnect remote access anytime by running /remote-control again.\n',
     )
@@ -2169,7 +2162,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     )
     const found = await readBridgePointerAcrossWorktrees(dir)
     if (!found) {
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: No recent session found in this directory or its worktrees. Run \`claude remote-control\` to start a new one.`,
       )
@@ -2180,7 +2172,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     const ageMin = Math.round(pointer.ageMs / 60_000)
     const ageStr = ageMin < 60 ? `${ageMin}m` : `${Math.round(ageMin / 60)}h`
     const fromWt = pointerDir !== dir ? ` from worktree ${pointerDir}` : ''
-    // biome-ignore lint/suspicious/noConsole: intentional info output
     console.error(
       `Resuming session ${pointer.sessionId} (${ageStr} ago)${fromWt}\u2026`,
     )
@@ -2201,7 +2192,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     !baseUrl.includes('localhost') &&
     !baseUrl.includes('127.0.0.1')
   ) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(
       'Error: Remote Control base URL uses HTTP. Only HTTPS or localhost HTTP is allowed.',
     )
@@ -2237,7 +2227,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     ? getCurrentProjectConfig().remoteControlSpawnMode
     : undefined
   if (savedSpawnMode === 'worktree' && !worktreeAvailable) {
-    // biome-ignore lint/suspicious/noConsole: intentional warning output
     console.error(
       'Warning: Saved spawn mode is worktree but this directory is not a git repository. Falling back to same-dir.',
     )
@@ -2264,7 +2253,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
       input: process.stdin,
       output: process.stdout,
     })
-    // biome-ignore lint/suspicious/noConsole: intentional dialog output
     console.log(
       `\nClaude Remote Control is launching in spawn mode which lets you create new sessions in this project from Claude Code on Web or your Mobile app. Learn more here: https://code.claude.com/docs/en/remote-control\n\n` +
         `Spawn mode for this project:\n` +
@@ -2343,7 +2331,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
   // Only reachable via explicit --spawn=worktree (default is same-dir);
   // saved worktree pref was already guarded above.
   if (spawnMode === 'worktree' && !worktreeAvailable) {
-    // biome-ignore lint/suspicious/noConsole: intentional error output
     console.error(
       `Error: Worktree mode requires a git repository or WorktreeCreate hooks configured. Use --spawn=session for single-session mode.`,
     )
@@ -2378,7 +2365,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     try {
       validateBridgeId(resumeSessionId, 'sessionId')
     } catch {
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: Invalid session ID "${resumeSessionId}". Session IDs must not contain unsafe characters.`,
       )
@@ -2404,7 +2390,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
         const { clearBridgePointer } = await import('./bridgePointer.js')
         await clearBridgePointer(resumePointerDir)
       }
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: Session ${resumeSessionId} not found. It may have been archived or expired, or your login may have lapsed (run \`claude /login\`).`,
       )
@@ -2416,7 +2401,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
         const { clearBridgePointer } = await import('./bridgePointer.js')
         await clearBridgePointer(resumePointerDir)
       }
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: Session ${resumeSessionId} has no environment_id. It may never have been attached to a bridge.`,
       )
@@ -2470,7 +2454,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
       status: err instanceof BridgeFatalError ? err.status : undefined,
     })
     // Registration failures are fatal — print a clean message instead of a stack trace.
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(
       err instanceof BridgeFatalError && err.status === 404
         ? 'Remote Control environments are not available for your account.'
@@ -2495,7 +2478,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
           `Bridge resume env mismatch: requested ${reuseEnvironmentId}, backend returned ${environmentId}. Falling back to fresh session.`,
         ),
       )
-      // biome-ignore lint/suspicious/noConsole: intentional warning output
       console.warn(
         `Warning: Could not resume session ${resumeSessionId} — its environment has expired. Creating a fresh session instead.`,
       )
@@ -2546,7 +2528,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
           const { clearBridgePointer } = await import('./bridgePointer.js')
           await clearBridgePointer(resumePointerDir)
         }
-        // biome-ignore lint/suspicious/noConsole: intentional error output
         console.error(
           isFatal
             ? `Error: ${errorMessage(err)}`

src/cli/exit.ts

@@ -17,7 +17,6 @@
 
 /** Write an error message to stderr (if given) and exit with code 1. */
 export function cliError(msg?: string): never {
-  // biome-ignore lint/suspicious/noConsole: centralized CLI error output
   if (msg) console.error(msg)
   process.exit(1)
   return undefined as never

src/cli/handlers/agents.ts

@@ -59,12 +59,9 @@ export async function agentsHandler(): Promise<void> {
   }
 
   if (lines.length === 0) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log('No agents found.')
   } else {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(`${totalActive} active agents\n`)
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(lines.join('\n').trimEnd())
   }
 }