fix(agent): sync session project dir

src/main/presenter/agentRuntimePresenter/index.ts

@@ -393,6 +393,10 @@ export class AgentRuntimePresenter implements IAgentImplementation {
     if (!state) {
       throw new Error(`Session ${sessionId} not found`)
     }
+    const projectDir =
+      options && Object.prototype.hasOwnProperty.call(options, 'projectDir')
+        ? this.resolveProjectDir(sessionId, options.projectDir)
+        : this.resolveProjectDir(sessionId)
 
     const shouldClaimImmediately =
       ((options?.source ?? 'send') === 'send' && this.isAwaitingToolQuestionFollowUp(sessionId)) ||
@@ -403,7 +407,7 @@ export class AgentRuntimePresenter implements IAgentImplementation {
 
     if (record.state === 'claimed') {
       void this.processMessage(sessionId, record.payload, {
-        projectDir: this.resolveProjectDir(sessionId),
+        projectDir,
         pendingQueueItemId: record.id,
         pendingQueueItemSource: options?.source ?? 'send'
       })
@@ -1006,6 +1010,17 @@ export class AgentRuntimePresenter implements IAgentImplementation {
     this.invalidateSystemPromptCache(sessionId)
   }
 
+  async setSessionProjectDir(sessionId: string, projectDir: string | null): Promise<void> {
+    const normalized = this.normalizeProjectDir(projectDir)
+    const previous = this.sessionProjectDirs.has(sessionId)
+      ? (this.sessionProjectDirs.get(sessionId) ?? null)
+      : this.resolvePersistedSessionProjectDir(sessionId)
+    this.sessionProjectDirs.set(sessionId, normalized)
+    if (previous !== normalized) {
+      this.invalidateSystemPromptCache(sessionId)
+    }
+  }
+
   async getPermissionMode(sessionId: string): Promise<PermissionMode> {
     const state = this.runtimeState.get(sessionId)
     if (state) {
@@ -4358,6 +4373,19 @@ export class AgentRuntimePresenter implements IAgentImplementation {
     return normalized ? normalized : null
   }
 
+  private resolvePersistedSessionProjectDir(sessionId: string): string | null {
+    try {
+      const session = this.sqlitePresenter.newSessionsTable?.get(sessionId)
+      return this.normalizeProjectDir(session?.project_dir ?? null)
+    } catch (error) {
+      console.warn('[DeepChatAgent] Failed to resolve persisted project directory:', {
+        sessionId,
+        error
+      })
+      return null
+    }
+  }
+
   private resolveProjectDir(sessionId: string, incoming?: string | null): string | null {
     if (incoming !== undefined) {
       const normalized = this.normalizeProjectDir(incoming)
@@ -4368,6 +4396,12 @@ export class AgentRuntimePresenter implements IAgentImplementation {
       }
       return normalized
     }
-    return this.sessionProjectDirs.get(sessionId) ?? null
+    if (this.sessionProjectDirs.has(sessionId)) {
+      return this.sessionProjectDirs.get(sessionId) ?? null
+    }
+
+    const persisted = this.resolvePersistedSessionProjectDir(sessionId)
+    this.sessionProjectDirs.set(sessionId, persisted)
+    return persisted
   }
 }

src/main/presenter/agentSessionPresenter/index.ts

@@ -415,9 +415,14 @@ export class AgentSessionPresenter {
     if (normalizedInput.text.trim() || (normalizedInput.files?.length ?? 0) > 0) {
       console.log(`[AgentSessionPresenter] firing queuePendingInput (non-blocking)`)
       if (agent.queuePendingInput) {
-        agent.queuePendingInput(sessionId, normalizedInput, { source: 'send' }).catch((err) => {
-          console.error('[AgentSessionPresenter] queuePendingInput failed:', err)
-        })
+        agent
+          .queuePendingInput(sessionId, normalizedInput, {
+            source: 'send',
+            projectDir
+          })
+          .catch((err) => {
+            console.error('[AgentSessionPresenter] queuePendingInput failed:', err)
+          })
       } else {
         agent.processMessage(sessionId, normalizedInput, { projectDir }).catch((err) => {
           console.error('[AgentSessionPresenter] processMessage failed:', err)
@@ -732,7 +737,10 @@ export class AgentSessionPresenter {
       session.projectDir ?? null
     )
     if (agent.queuePendingInput) {
-      await agent.queuePendingInput(sessionId, normalizedInput, { source: 'send' })
+      await agent.queuePendingInput(sessionId, normalizedInput, {
+        source: 'send',
+        projectDir: session.projectDir ?? null
+      })
       if (!hadMessages && !wasDraft) {
         void this.generateSessionTitle(sessionId, session.title, providerId, state?.modelId ?? '')
       }
@@ -794,7 +802,10 @@ export class AgentSessionPresenter {
       currentSession.agentId,
       currentSession.projectDir ?? null
     )
-    return await agent.queuePendingInput(sessionId, normalizedInput, { source: 'queue' })
+    return await agent.queuePendingInput(sessionId, normalizedInput, {
+      source: 'queue',
+      projectDir: currentSession.projectDir ?? null
+    })
   }
 
   async updateQueuedInput(sessionId: string, itemId: string, content: string | SendMessageInput) {
@@ -1696,12 +1707,25 @@ export class AgentSessionPresenter {
       throw new Error(`Session not found: ${sessionId}`)
     }
 
-    this.sessionManager.update(sessionId, { projectDir })
+    const agent = await this.resolveAgentImplementation(session.agentId)
+    const state = await agent.getSessionState(sessionId)
+    const providerId =
+      state?.providerId?.trim() ||
+      ((await this.getAgentType(session.agentId)) === 'acp' ? 'acp' : '')
+    const normalizedProjectDir = projectDir?.trim() || null
+    this.assertAcpSessionHasWorkdir(providerId, normalizedProjectDir)
+
+    this.sessionManager.update(sessionId, { projectDir: normalizedProjectDir })
 
     // Sync environment for new project dir
-    if (projectDir) {
-      this.sqlitePresenter.newEnvironmentsTable.syncPath(projectDir)
+    if (normalizedProjectDir) {
+      this.sqlitePresenter.newEnvironmentsTable.syncPath(normalizedProjectDir)
+    }
+
+    if (agent.setSessionProjectDir) {
+      await agent.setSessionProjectDir(sessionId, normalizedProjectDir)
     }
+    await this.syncAcpSessionWorkdir(providerId, sessionId, session.agentId, normalizedProjectDir)
 
     const updated = this.sessionManager.get(sessionId)
     if (!updated) {

src/shared/types/agent-interface.d.ts

@@ -41,6 +41,7 @@ export type PendingInputEnqueueSource = 'send' | 'queue'
 
 export interface QueuePendingInputOptions {
   source?: PendingInputEnqueueSource
+  projectDir?: string | null
 }
 
 export interface IAgentImplementation {
@@ -147,6 +148,9 @@ export interface IAgentImplementation {
   /** Set provider/model for this session (takes effect on next user message) */
   setSessionModel?(sessionId: string, providerId: string, modelId: string): Promise<void>
 
+  /** Set project/workspace directory for this session (takes effect on next user message) */
+  setSessionProjectDir?(sessionId: string, projectDir: string | null): Promise<void>
+
   /** Get permission mode for this session */
   getPermissionMode?(sessionId: string): Promise<PermissionMode>
 

test/main/presenter/agentRuntimePresenter/agentRuntimePresenter.test.ts

@@ -57,11 +57,21 @@ vi.mock('@/presenter', () => ({
 vi.mock('@/lib/agentRuntime/systemEnvPromptBuilder', () => ({
   buildRuntimeCapabilitiesPrompt: vi.fn(() => 'RUNTIME_CAPABILITIES'),
   buildSystemEnvPrompt: vi.fn(
-    async (options?: { providerId?: string; modelId?: string; now?: Date }) => {
+    async (options?: {
+      providerId?: string
+      modelId?: string
+      now?: Date
+      workdir?: string | null
+    }) => {
       const providerId = options?.providerId || 'unknown-provider'
       const modelId = options?.modelId || 'unknown-model'
       const dateText = (options?.now ?? new Date()).toDateString()
-      return ['ENV_BLOCK', `MODEL:${providerId}/${modelId}`, `DATE:${dateText}`].join('\n')
+      return [
+        'ENV_BLOCK',
+        `MODEL:${providerId}/${modelId}`,
+        `WORKDIR:${options?.workdir ?? ''}`,
+        `DATE:${dateText}`
+      ].join('\n')
     }
   )
 }))
@@ -1309,6 +1319,51 @@ describe('AgentRuntimePresenter', () => {
       expect(secondCallArgs.messages[0].content).toContain('Updated user prompt')
     })
 
+    it('invalidates cached prompt after session project directory update', async () => {
+      vi.useFakeTimers()
+      vi.setSystemTime(new Date('2026-03-05T08:00:00.000Z'))
+      const envBuilder = buildSystemEnvPrompt as ReturnType<typeof vi.fn>
+
+      await agent.initSession('s1', { providerId: 'openai', modelId: 'gpt-4' })
+      await agent.processMessage('s1', 'Before project update')
+
+      await agent.setSessionProjectDir('s1', '/tmp/workspace')
+      await agent.processMessage('s1', 'After project update')
+
+      expect(envBuilder).toHaveBeenCalledTimes(2)
+
+      const secondCallArgs = (processStream as ReturnType<typeof vi.fn>).mock.calls[1][0]
+      expect(secondCallArgs.messages[0].content).toContain('WORKDIR:/tmp/workspace')
+    })
+
+    it('uses persisted project directory when runtime state was restored from DB', async () => {
+      vi.useFakeTimers()
+      vi.setSystemTime(new Date('2026-03-05T08:00:00.000Z'))
+      sqlitePresenter.deepchatSessionsTable.get.mockReturnValue({
+        id: 's-restored',
+        provider_id: 'openai',
+        model_id: 'gpt-4',
+        permission_mode: 'full_access'
+      })
+      sqlitePresenter.newSessionsTable.get.mockReturnValue({
+        id: 's-restored',
+        agent_id: 'deepchat',
+        project_dir: '/tmp/restored-workspace'
+      })
+
+      await agent.getSessionState('s-restored')
+      await agent.processMessage('s-restored', 'Restored session follow-up')
+
+      const callArgs = (processStream as ReturnType<typeof vi.fn>).mock.calls[0][0]
+      expect(callArgs.messages[0].content).toContain('WORKDIR:/tmp/restored-workspace')
+      expect(toolPresenter.getAllToolDefinitions).toHaveBeenCalledWith(
+        expect.objectContaining({
+          conversationId: 's-restored',
+          agentWorkspacePath: '/tmp/restored-workspace'
+        })
+      )
+    })
+
     it('invalidates cached prompt across natural days', async () => {
       vi.useFakeTimers()
       const envBuilder = buildSystemEnvPrompt as ReturnType<typeof vi.fn>
@@ -2761,13 +2816,16 @@ describe('AgentRuntimePresenter', () => {
         .mockReturnValue(claimedRecord)
       const processSpy = vi.spyOn(agent, 'processMessage').mockResolvedValue()
 
-      const result = await agent.queuePendingInput('s1', 'Hello')
+      const result = await agent.queuePendingInput('s1', 'Hello', {
+        projectDir: '/tmp/workspace'
+      })
 
       expect(queueSpy).toHaveBeenCalledWith('s1', 'Hello', { state: 'claimed' })
       expect(processSpy).toHaveBeenCalledWith(
         's1',
         claimedRecord.payload,
         expect.objectContaining({
+          projectDir: '/tmp/workspace',
           pendingQueueItemId: claimedRecord.id
         })
       )

test/main/presenter/agentSessionPresenter/agentSessionPresenter.test.ts

@@ -69,6 +69,7 @@ function createMockDeepChatAgent() {
     getMessageIds: vi.fn().mockResolvedValue([]),
     getMessage: vi.fn().mockResolvedValue(null),
     setSessionModel: vi.fn().mockResolvedValue(undefined),
+    setSessionProjectDir: vi.fn().mockResolvedValue(undefined),
     getGenerationSettings: vi.fn().mockResolvedValue({
       systemPrompt: 'Default prompt',
       temperature: 0.7,
@@ -349,6 +350,34 @@ describe('AgentSessionPresenter', () => {
       )
     })
 
+    it('passes project directory to queued first messages', async () => {
+      const queuePendingInput = vi.fn().mockResolvedValue({
+        id: 'q1',
+        sessionId: 'mock-session-id',
+        mode: 'queue',
+        state: 'claimed',
+        payload: { text: 'Hello', files: [] },
+        queueOrder: 1,
+        claimedAt: 1,
+        consumedAt: null,
+        createdAt: 1,
+        updatedAt: 1
+      })
+      ;(deepChatAgent as any).queuePendingInput = queuePendingInput
+
+      await presenter.createSession(
+        { agentId: 'deepchat', message: 'Hello', projectDir: '/tmp/proj' },
+        1
+      )
+
+      expect(queuePendingInput).toHaveBeenCalledWith(
+        'mock-session-id',
+        { text: 'Hello', files: [] },
+        { source: 'send', projectDir: '/tmp/proj' }
+      )
+      expect(deepChatAgent.processMessage).not.toHaveBeenCalled()
+    })
+
     it('emits ACTIVATED and LIST_UPDATED events', async () => {
       await presenter.createSession({ agentId: 'deepchat', message: 'Hello' }, 42)
 
@@ -887,11 +916,40 @@ describe('AgentSessionPresenter', () => {
       expect(queuePendingInput).toHaveBeenCalledWith(
         's1',
         { text: 'Later', files: [] },
-        { source: 'queue' }
+        { source: 'queue', projectDir: '/tmp/workspace' }
       )
     })
   })
 
+  describe('setSessionProjectDir', () => {
+    it('syncs workspace changes into the active agent runtime', async () => {
+      const row = {
+        id: 's1',
+        agent_id: 'deepchat',
+        title: 'Test',
+        project_dir: null as string | null,
+        is_pinned: 0,
+        is_draft: 0,
+        created_at: 1000,
+        updated_at: 1000
+      }
+      sqlitePresenter.newSessionsTable.get.mockImplementation(() => row)
+      sqlitePresenter.newSessionsTable.update.mockImplementation((_: string, fields: any) => {
+        if (fields.project_dir !== undefined) {
+          row.project_dir = fields.project_dir
+        }
+      })
+
+      await presenter.setSessionProjectDir('s1', '/tmp/workspace')
+
+      expect(sqlitePresenter.newSessionsTable.update).toHaveBeenCalledWith('s1', {
+        project_dir: '/tmp/workspace'
+      })
+      expect(deepChatAgent.setSessionProjectDir).toHaveBeenCalledWith('s1', '/tmp/workspace')
+      expect(sqlitePresenter.newEnvironmentsTable.syncPath).toHaveBeenCalledWith('/tmp/workspace')
+    })
+  })
+
   describe('ensureAcpDraftSession', () => {
     it('creates draft session and prepares ACP session setup', async () => {
       configPresenter.getAcpAgents.mockResolvedValue([