Skip to content

fix: clone_remote 路由决策实际执行仓库克隆 #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lishuceo merged 3 commits into from
Mar 5, 2026
Merged

fix: clone_remote 路由决策实际执行仓库克隆 #114

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95b488d
fix: clone_remote 路由决策实际执行仓库克隆
lishuceo Mar 4, 2026
1f50b31
fix: 提取 resolveWorkdir 消除重复的工作区创建逻辑
lishuceo Mar 5, 2026
78e950b
fix: 传递 decision.branch 到 setupWorkspace sourceBranch
lishuceo Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions src/feishu/thread-context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import { basename } from 'node:path';
import { config } from '../config.js';
import { logger } from '../utils/logger.js';
import { sessionManager } from '../session/manager.js';
import { routeWorkspace } from '../claude/router.js';
import { routeWorkspace, type RoutingDecision } from '../claude/router.js';
import { isAutoWorkspacePath, ensureIsolatedWorkspace } from '../workspace/isolation.js';
import { setupWorkspace } from '../workspace/manager.js';
import { isOwner } from '../utils/security.js';
import { consumePreApproved } from './approval.js';
import { ensureThread } from './thread-utils.js';
Expand Down Expand Up @@ -56,6 +57,25 @@ export interface ResolveParams {
pipelineMode?: boolean;
}

/**
* 根据路由决策创建或隔离工作区
*
* clone_remote: 通过 setupWorkspace 从 bare cache 克隆到隔离工作区
* use_existing / use_default: 通过 ensureIsolatedWorkspace 隔离本地仓库
*/
function resolveWorkdir(
decision: RoutingDecision,
isolationMode: 'readonly' | 'writable',
): { workingDir: string; warning?: string } {
if (decision.decision === 'clone_remote' && decision.repo_url) {
const result = setupWorkspace({ repoUrl: decision.repo_url, mode: isolationMode, sourceBranch: decision.branch });
return { workingDir: result.workspacePath, warning: result.warning };
}
const workingDir = decision.workdir || config.claude.defaultWorkDir;
const isolated = ensureIsolatedWorkspace(workingDir, isolationMode);
return { workingDir: isolated.workingDir, warning: isolated.warning };
}

/**
* 解析话题上下文（thread + 路由 + 工作区隔离 + greeting）
*
Expand Down Expand Up @@ -154,13 +174,12 @@ export async function resolveThreadContext(params: ResolveParams): Promise<Resol
return { status: 'error' };
}

workingDir = decision.workdir || config.claude.defaultWorkDir;
warning = decision.warning;
try {
const isolationMode = isOwner(userId) ? 'writable' : (decision.mode || 'readonly');
const isolated = ensureIsolatedWorkspace(workingDir, isolationMode);
workingDir = isolated.workingDir;
warning = warning || isolated.warning;
const resolved = resolveWorkdir(decision, isolationMode);
workingDir = resolved.workingDir;
warning = warning || resolved.warning;
} catch (err) {
const errorMsg = `❌ 无法创建隔离工作区: ${(err as Error).message}`;
if (threadReplyMsgId) {
Expand Down Expand Up @@ -212,13 +231,12 @@ export async function resolveThreadContext(params: ResolveParams): Promise<Resol
return { status: 'error' };
}

workingDir = decision.workdir || config.claude.defaultWorkDir;
warning = decision.warning;
try {
const isolationMode = isOwner(userId) ? 'writable' : (decision.mode || 'readonly');
const isolated = ensureIsolatedWorkspace(workingDir, isolationMode);
workingDir = isolated.workingDir;
warning = warning || isolated.warning;
const resolved = resolveWorkdir(decision, isolationMode);
workingDir = resolved.workingDir;
warning = warning || resolved.warning;
} catch (err) {
const errorMsg = `❌ 无法创建隔离工作区: ${(err as Error).message}`;
if (threadReplyMsgId) {
Expand Down
Loading