@jingyi0605/codingns 0.1.5 → 0.2.5

package/dist/server/modules/worktree/worktree-merge-service.d.ts

@@ -0,0 +1,52 @@
+import type { Workspace, WorkspaceWorktreeRecord } from "../../types/domain.js";
+import type { WorkspaceWorktreeRepository } from "../../storage/repositories/workspace-worktree-repository.js";
+import type { WorkspaceService } from "../workspace/workspace-service.js";
+import type { GitReadService } from "../git/git-read-service.js";
+import type { GitCommandRunner } from "../git/git-command-runner.js";
+import type { WorktreeSyncService } from "./worktree-sync-service.js";
+export type WorktreeMergeBlockerCode = "SOURCE_NOT_ACTIVE" | "SOURCE_DIRTY" | "TARGET_DIRTY" | "HAS_ACTIVE_CHILDREN" | "NO_COMMITS_TO_MERGE" | "HAS_CONFLICTS";
+export interface WorktreeMergeBlocker {
+    code: WorktreeMergeBlockerCode;
+    detail: string;
+}
+export interface WorktreeMergePreviewResult {
+    workspaceId: string;
+    sourceWorkspace: Workspace;
+    targetWorkspace: Workspace;
+    meta: WorkspaceWorktreeRecord;
+    sourceBranchName: string;
+    targetBranchName: string;
+    sourceHeadCommit: string | null;
+    targetHeadCommit: string | null;
+    mergeBaseCommit: string | null;
+    ahead: number;
+    behind: number;
+    hasConflicts: boolean;
+    conflictPaths: string[];
+    alreadyMerged: boolean;
+    canMerge: boolean;
+    blockers: WorktreeMergeBlocker[];
+}
+export interface WorktreeMergeApplyResult {
+    preview: WorktreeMergePreviewResult;
+    applied: boolean;
+    mergeCommit: string | null;
+    meta: WorkspaceWorktreeRecord;
+}
+export declare class WorktreeMergeService {
+    private readonly workspaceService;
+    private readonly workspaceWorktreeRepository;
+    private readonly gitReadService;
+    private readonly gitCommandRunner;
+    private readonly worktreeSyncService;
+    constructor(workspaceService: WorkspaceService, workspaceWorktreeRepository: WorkspaceWorktreeRepository, gitReadService: GitReadService, gitCommandRunner: GitCommandRunner, worktreeSyncService: WorktreeSyncService);
+    preview(workspaceId: string): Promise<WorktreeMergePreviewResult>;
+    apply(workspaceId: string): Promise<WorktreeMergeApplyResult>;
+    private resolveActiveWorktreeMeta;
+    private normalizePreviewMeta;
+    private resolveCommit;
+    private resolveMergeBase;
+    private resolveAheadBehind;
+    private isAncestor;
+    private detectConflictPaths;
+}

package/dist/server/modules/worktree/worktree-merge-service.js

@@ -0,0 +1,293 @@
+import { AppError } from "../../shared/errors/app-error.js";
+import { nowIso } from "../../shared/utils/time.js";
+const WORKTREE_MERGE_TIMEOUT_MS = 60_000;
+export class WorktreeMergeService {
+    workspaceService;
+    workspaceWorktreeRepository;
+    gitReadService;
+    gitCommandRunner;
+    worktreeSyncService;
+    constructor(workspaceService, workspaceWorktreeRepository, gitReadService, gitCommandRunner, worktreeSyncService) {
+        this.workspaceService = workspaceService;
+        this.workspaceWorktreeRepository = workspaceWorktreeRepository;
+        this.gitReadService = gitReadService;
+        this.gitCommandRunner = gitCommandRunner;
+        this.worktreeSyncService = worktreeSyncService;
+    }
+    async preview(workspaceId) {
+        const meta = await this.resolveActiveWorktreeMeta(workspaceId);
+        const sourceWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.workspaceId);
+        const targetWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.parentWorkspaceId);
+        const [sourceStatus, targetStatus] = await Promise.all([
+            this.gitReadService.getStatus(sourceWorkspace.id),
+            this.gitReadService.getStatus(targetWorkspace.id)
+        ]);
+        const sourceHeadCommit = await this.resolveCommit(sourceWorkspace.path, sourceWorkspace.id, "HEAD");
+        const targetHeadCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD");
+        const mergeBaseCommit = sourceHeadCommit && targetHeadCommit
+            ? await this.resolveMergeBase(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit)
+            : null;
+        const { ahead, behind } = sourceHeadCommit && targetHeadCommit
+            ? await this.resolveAheadBehind(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit)
+            : { ahead: 0, behind: 0 };
+        const alreadyMerged = Boolean(sourceHeadCommit)
+            && Boolean(targetHeadCommit)
+            && await this.isAncestor(targetWorkspace.path, targetWorkspace.id, sourceHeadCommit ?? "", targetHeadCommit ?? "");
+        const childRecords = this.workspaceWorktreeRepository
+            .listByParentWorkspaceId(meta.workspaceId)
+            .filter((record) => record.lifecycleStatus === "active" || record.lifecycleStatus === "removing");
+        const blockers = [];
+        const normalizedMeta = this.normalizePreviewMeta(meta, alreadyMerged);
+        if (!alreadyMerged && normalizedMeta.lifecycleStatus !== "active") {
+            blockers.push({
+                code: "SOURCE_NOT_ACTIVE",
+                detail: "当前子工作树不是活跃状态，不能继续合并"
+            });
+        }
+        if (sourceStatus.snapshot.isDirty) {
+            blockers.push({
+                code: "SOURCE_DIRTY",
+                detail: "当前子工作树存在未提交改动，先提交或清理后再合并"
+            });
+        }
+        if (targetStatus.snapshot.isDirty) {
+            blockers.push({
+                code: "TARGET_DIRTY",
+                detail: "直接父工作区存在未提交改动，不能接收合并"
+            });
+        }
+        if (childRecords.length > 0) {
+            blockers.push({
+                code: "HAS_ACTIVE_CHILDREN",
+                detail: "当前子工作树下面还有活跃子节点，必须先从叶子节点开始回收"
+            });
+        }
+        if (!alreadyMerged && ahead === 0) {
+            blockers.push({
+                code: "NO_COMMITS_TO_MERGE",
+                detail: "当前子工作树没有领先父工作区的提交"
+            });
+        }
+        const conflictPaths = !alreadyMerged
+            && ahead > 0
+            && blockers.every((item) => item.code !== "SOURCE_DIRTY" && item.code !== "TARGET_DIRTY")
+            ? await this.detectConflictPaths(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit)
+            : [];
+        if (conflictPaths.length > 0) {
+            blockers.push({
+                code: "HAS_CONFLICTS",
+                detail: `检测到合并冲突：${conflictPaths.join("、")}`
+            });
+        }
+        return {
+            workspaceId: meta.workspaceId,
+            sourceWorkspace,
+            targetWorkspace,
+            meta: normalizedMeta,
+            sourceBranchName: sourceStatus.snapshot.branch,
+            targetBranchName: targetStatus.snapshot.branch,
+            sourceHeadCommit,
+            targetHeadCommit,
+            mergeBaseCommit,
+            ahead,
+            behind,
+            hasConflicts: conflictPaths.length > 0,
+            conflictPaths,
+            alreadyMerged,
+            canMerge: blockers.length === 0 && !alreadyMerged,
+            blockers
+        };
+    }
+    async apply(workspaceId) {
+        const preview = await this.preview(workspaceId);
+        const meta = preview.meta;
+        if (!preview.alreadyMerged && preview.blockers.length > 0) {
+            const blocker = preview.blockers[0];
+            throw new AppError({
+                statusCode: 409,
+                errorCode: `WORKTREE_MERGE_${blocker.code}`,
+                detail: blocker.detail
+            });
+        }
+        const targetWorkspace = preview.targetWorkspace;
+        const timestamp = nowIso();
+        let applied = false;
+        if (!preview.alreadyMerged) {
+            const mergeResult = await this.gitCommandRunner.run(targetWorkspace.path, ["merge", "--no-ff", "--no-edit", preview.meta.branchName], {
+                allowNonZeroExit: true,
+                timeoutMs: WORKTREE_MERGE_TIMEOUT_MS,
+                workspaceId: targetWorkspace.id,
+                operation: "worktree.merge.apply"
+            });
+            if (mergeResult.exitCode !== 0) {
+                await this.gitCommandRunner.run(targetWorkspace.path, ["merge", "--abort"], {
+                    allowNonZeroExit: true,
+                    workspaceId: targetWorkspace.id,
+                    operation: "worktree.merge.abort"
+                });
+                throw new AppError({
+                    statusCode: 409,
+                    errorCode: "WORKTREE_MERGE_APPLY_FAILED",
+                    detail: mergeResult.stderr.trim() || mergeResult.stdout.trim() || "合并执行失败"
+                });
+            }
+            applied = true;
+        }
+        const mergeCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD");
+        const nextMeta = this.workspaceWorktreeRepository.update({
+            ...meta,
+            lifecycleStatus: "merged",
+            mergedAt: meta.mergedAt ?? timestamp,
+            updatedAt: timestamp
+        });
+        if (!nextMeta) {
+            throw new AppError({
+                statusCode: 500,
+                errorCode: "WORKTREE_META_UPDATE_FAILED",
+                detail: "工作树合并成功，但元数据更新失败"
+            });
+        }
+        const parentMeta = this.workspaceWorktreeRepository.findByWorkspaceId(targetWorkspace.id);
+        if (parentMeta) {
+            this.workspaceWorktreeRepository.update({
+                ...parentMeta,
+                headCommit: mergeCommit,
+                updatedAt: timestamp
+            });
+        }
+        return {
+            preview: {
+                ...preview,
+                meta: nextMeta,
+                alreadyMerged: true,
+                canMerge: false,
+                blockers: [],
+                targetHeadCommit: mergeCommit
+            },
+            applied,
+            mergeCommit,
+            meta: nextMeta
+        };
+    }
+    async resolveActiveWorktreeMeta(workspaceId) {
+        const normalizedWorkspaceId = workspaceId.trim();
+        if (!normalizedWorkspaceId) {
+            throw new AppError({
+                statusCode: 400,
+                errorCode: "INVALID_INPUT",
+                detail: "工作树 workspaceId 不能为空",
+                field: "workspaceId"
+            });
+        }
+        const meta = this.workspaceWorktreeRepository.findByWorkspaceId(normalizedWorkspaceId);
+        if (!meta) {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "WORKTREE_NOT_FOUND",
+                detail: "指定工作区不是子工作树"
+            });
+        }
+        await this.worktreeSyncService.syncRoot(meta.rootWorkspaceId);
+        const nextMeta = this.workspaceWorktreeRepository.findByWorkspaceId(normalizedWorkspaceId);
+        if (!nextMeta || nextMeta.lifecycleStatus === "removed") {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "WORKTREE_NOT_FOUND",
+                detail: "指定工作树已经不存在"
+            });
+        }
+        return nextMeta;
+    }
+    normalizePreviewMeta(meta, alreadyMerged) {
+        if (alreadyMerged) {
+            if (meta.lifecycleStatus === "merged" && meta.mergedAt) {
+                return meta;
+            }
+            return (this.workspaceWorktreeRepository.update({
+                ...meta,
+                lifecycleStatus: "merged",
+                mergedAt: meta.mergedAt ?? nowIso(),
+                updatedAt: nowIso()
+            }) ?? meta);
+        }
+        if (meta.lifecycleStatus === "active") {
+            return meta;
+        }
+        return (this.workspaceWorktreeRepository.update({
+            ...meta,
+            lifecycleStatus: "active",
+            mergedAt: null,
+            updatedAt: nowIso()
+        }) ?? meta);
+    }
+    async resolveCommit(cwd, workspaceId, ref) {
+        const result = await this.gitCommandRunner.run(cwd, ["rev-parse", "--verify", ref], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.merge.resolveCommit"
+        });
+        return result.exitCode === 0 ? result.stdout.trim() || null : null;
+    }
+    async resolveMergeBase(cwd, workspaceId, targetHeadCommit, sourceHeadCommit) {
+        const result = await this.gitCommandRunner.run(cwd, ["merge-base", targetHeadCommit, sourceHeadCommit], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.merge.previewBase"
+        });
+        return result.exitCode === 0 ? result.stdout.trim() || null : null;
+    }
+    async resolveAheadBehind(cwd, workspaceId, targetHeadCommit, sourceHeadCommit) {
+        const result = await this.gitCommandRunner.run(cwd, ["rev-list", "--left-right", "--count", `${targetHeadCommit}...${sourceHeadCommit}`], {
+            workspaceId,
+            operation: "worktree.merge.previewAheadBehind"
+        });
+        const [behindRaw, aheadRaw] = result.stdout.trim().split(/\s+/);
+        return {
+            ahead: Number(aheadRaw ?? "0") || 0,
+            behind: Number(behindRaw ?? "0") || 0
+        };
+    }
+    async isAncestor(cwd, workspaceId, ancestorCommit, descendantCommit) {
+        const result = await this.gitCommandRunner.run(cwd, ["merge-base", "--is-ancestor", ancestorCommit, descendantCommit], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.merge.previewAncestor"
+        });
+        return result.exitCode === 0;
+    }
+    async detectConflictPaths(cwd, workspaceId, targetHeadCommit, sourceHeadCommit) {
+        if (!targetHeadCommit || !sourceHeadCommit) {
+            return [];
+        }
+        const result = await this.gitCommandRunner.run(cwd, ["merge-tree", "--write-tree", targetHeadCommit, sourceHeadCommit], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.merge.previewConflicts"
+        });
+        if (result.exitCode === 0) {
+            return [];
+        }
+        return Array.from(parseMergeConflictPaths(result.stdout, result.stderr));
+    }
+}
+function parseMergeConflictPaths(stdout, stderr) {
+    const paths = new Set();
+    const content = `${stdout}\n${stderr}`;
+    for (const line of content.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed) {
+            continue;
+        }
+        const stageMatch = trimmed.match(/^\d{6}\s+[0-9a-f]{40}\s+\d\t(.+)$/i);
+        if (stageMatch?.[1]) {
+            paths.add(stageMatch[1]);
+            continue;
+        }
+        const conflictMatch = trimmed.match(/Merge conflict in (.+)$/i);
+        if (conflictMatch?.[1]) {
+            paths.add(conflictMatch[1]);
+        }
+    }
+    return paths;
+}
+//# sourceMappingURL=worktree-merge-service.js.map

package/dist/server/modules/worktree/worktree-merge-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-merge-service.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-merge-service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/worktree/worktree-sync-service.d.ts

@@ -0,0 +1,23 @@
+import type { WorkspaceService } from "../workspace/workspace-service.js";
+import type { GitCommandRunner } from "../git/git-command-runner.js";
+import type { WorkspaceWorktreeRepository } from "../../storage/repositories/workspace-worktree-repository.js";
+export interface WorktreeSyncIssue {
+    type: "workspace_missing";
+    workspaceId: string;
+    branchName: string;
+}
+export interface WorktreeSyncResult {
+    rootWorkspaceId: string;
+    updatedWorkspaceIds: string[];
+    removedWorkspaceIds: string[];
+    issues: WorktreeSyncIssue[];
+}
+export declare class WorktreeSyncService {
+    private readonly workspaceService;
+    private readonly workspaceWorktreeRepository;
+    private readonly gitCommandRunner;
+    constructor(workspaceService: WorkspaceService, workspaceWorktreeRepository: WorkspaceWorktreeRepository, gitCommandRunner: GitCommandRunner);
+    syncRoot(rootWorkspaceId: string): Promise<WorktreeSyncResult>;
+    private markWorktreeRemoved;
+    private updateHeadSnapshot;
+}

package/dist/server/modules/worktree/worktree-sync-service.js

@@ -0,0 +1,166 @@
+import fs from "node:fs";
+import path from "node:path";
+import { AppError } from "../../shared/errors/app-error.js";
+import { nowIso } from "../../shared/utils/time.js";
+export class WorktreeSyncService {
+    workspaceService;
+    workspaceWorktreeRepository;
+    gitCommandRunner;
+    constructor(workspaceService, workspaceWorktreeRepository, gitCommandRunner) {
+        this.workspaceService = workspaceService;
+        this.workspaceWorktreeRepository = workspaceWorktreeRepository;
+        this.gitCommandRunner = gitCommandRunner;
+    }
+    async syncRoot(rootWorkspaceId) {
+        const requestedWorkspaceId = rootWorkspaceId.trim();
+        if (!requestedWorkspaceId) {
+            throw new AppError({
+                statusCode: 400,
+                errorCode: "INVALID_INPUT",
+                detail: "根工作区不能为空",
+                field: "rootWorkspaceId"
+            });
+        }
+        const rootMeta = this.workspaceWorktreeRepository.findByWorkspaceId(requestedWorkspaceId);
+        const resolvedRootWorkspaceId = rootMeta?.rootWorkspaceId ?? requestedWorkspaceId;
+        const rootWorkspace = this.workspaceService.getWorkspaceOrThrow(resolvedRootWorkspaceId);
+        const listResult = await this.gitCommandRunner.run(rootWorkspace.path, ["worktree", "list", "--porcelain"], {
+            workspaceId: resolvedRootWorkspaceId,
+            operation: "worktree.sync.list"
+        });
+        const actualEntryByPath = new Map(parseWorktreeList(listResult.stdout)
+            .map((entry) => [normalizeWorktreePath(entry.path), entry]));
+        const syncResult = {
+            rootWorkspaceId: resolvedRootWorkspaceId,
+            updatedWorkspaceIds: [],
+            removedWorkspaceIds: [],
+            issues: []
+        };
+        const candidateRecords = this.workspaceWorktreeRepository
+            .listByRootWorkspaceId(resolvedRootWorkspaceId)
+            .filter((record) => record.lifecycleStatus === "active" || record.lifecycleStatus === "removing");
+        let shouldPrune = false;
+        for (const record of candidateRecords) {
+            let workspacePath;
+            try {
+                workspacePath = this.workspaceService.getWorkspaceOrThrow(record.workspaceId).path;
+            }
+            catch {
+                syncResult.issues.push({
+                    type: "workspace_missing",
+                    workspaceId: record.workspaceId,
+                    branchName: record.branchName
+                });
+                continue;
+            }
+            const entry = actualEntryByPath.get(normalizeWorktreePath(workspacePath));
+            if (!entry || entry.prunable || !fs.existsSync(workspacePath)) {
+                shouldPrune = shouldPrune || Boolean(entry?.prunable);
+                this.markWorktreeRemoved(record);
+                syncResult.removedWorkspaceIds.push(record.workspaceId);
+                continue;
+            }
+            const updated = this.updateHeadSnapshot(record, entry);
+            if (updated) {
+                syncResult.updatedWorkspaceIds.push(record.workspaceId);
+            }
+        }
+        if (shouldPrune) {
+            await this.gitCommandRunner.run(rootWorkspace.path, ["worktree", "prune"], {
+                allowNonZeroExit: true,
+                workspaceId: resolvedRootWorkspaceId,
+                operation: "worktree.sync.prune"
+            });
+        }
+        return syncResult;
+    }
+    markWorktreeRemoved(record) {
+        const timestamp = nowIso();
+        this.workspaceWorktreeRepository.update({
+            ...record,
+            lifecycleStatus: "removed",
+            removedAt: record.removedAt ?? timestamp,
+            updatedAt: timestamp
+        });
+        try {
+            this.workspaceService.removeWorkspace(record.workspaceId);
+        }
+        catch {
+            // 工作区记录不存在时，只保留元数据修复结果。
+        }
+    }
+    updateHeadSnapshot(record, entry) {
+        const nextBranchName = entry.branchRef ? stripBranchRef(entry.branchRef) : record.branchName;
+        const nextHeadCommit = entry.headCommit ?? record.headCommit;
+        if (nextBranchName === record.branchName && nextHeadCommit === record.headCommit) {
+            return false;
+        }
+        this.workspaceWorktreeRepository.update({
+            ...record,
+            branchName: nextBranchName,
+            headCommit: nextHeadCommit,
+            updatedAt: nowIso()
+        });
+        return true;
+    }
+}
+function parseWorktreeList(input) {
+    const lines = input
+        .split(/\r?\n/)
+        .map((line) => line.trimEnd());
+    const entries = [];
+    let current = null;
+    for (const line of lines) {
+        if (!line) {
+            if (current) {
+                entries.push(current);
+            }
+            current = null;
+            continue;
+        }
+        if (line.startsWith("worktree ")) {
+            if (current) {
+                entries.push(current);
+            }
+            current = {
+                path: line.slice("worktree ".length).trim(),
+                headCommit: null,
+                branchRef: null,
+                prunable: false
+            };
+            continue;
+        }
+        if (!current) {
+            continue;
+        }
+        if (line.startsWith("HEAD ")) {
+            current.headCommit = line.slice("HEAD ".length).trim() || null;
+            continue;
+        }
+        if (line.startsWith("branch ")) {
+            current.branchRef = line.slice("branch ".length).trim() || null;
+            continue;
+        }
+        if (line.startsWith("prunable")) {
+            current.prunable = true;
+        }
+    }
+    if (current) {
+        entries.push(current);
+    }
+    return entries;
+}
+function stripBranchRef(branchRef) {
+    return branchRef.startsWith("refs/heads/")
+        ? branchRef.slice("refs/heads/".length)
+        : branchRef;
+}
+function normalizeWorktreePath(input) {
+    const resolved = path.resolve(input);
+    const realPath = fs.existsSync(resolved) ? fs.realpathSync.native(resolved) : resolved;
+    if (process.platform === "win32") {
+        return realPath.toLowerCase();
+    }
+    return realPath;
+}
+//# sourceMappingURL=worktree-sync-service.js.map

package/dist/server/modules/worktree/worktree-sync-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-sync-service.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-sync-service.ts"],"names":[],"mappings":"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"}

package/dist/server/routes/assistant.d.ts

@@ -0,0 +1,3 @@
+import type { FastifyInstance } from "fastify";
+import type { AssistantCapabilityController } from "../modules/assistant-capability/assistant-capability-controller.js";
+export declare function registerAssistantCapabilityRoutes(app: FastifyInstance, assistantCapabilityController: AssistantCapabilityController): Promise<void>;

package/dist/server/routes/assistant.js

@@ -0,0 +1,15 @@
+export async function registerAssistantCapabilityRoutes(app, assistantCapabilityController) {
+    app.get("/api/assistant/capabilities", assistantCapabilityController.listCapabilities);
+    app.get("/api/assistant/projects", assistantCapabilityController.listProjects);
+    app.get("/api/assistant/projects/:projectId", assistantCapabilityController.getProject);
+    app.get("/api/assistant/projects/:projectId/sessions", assistantCapabilityController.listProjectSessions);
+    app.get("/api/assistant/sessions/:sessionId", assistantCapabilityController.getSession);
+    app.get("/api/assistant/sessions/:sessionId/messages", assistantCapabilityController.listSessionMessages);
+    app.get("/api/assistant/sessions/:sessionId/runtime", assistantCapabilityController.getSessionRuntime);
+    app.post("/api/assistant/sessions/:sessionId/messages", assistantCapabilityController.sendSessionMessage);
+    app.post("/api/assistant/sessions/:sessionId/forks", assistantCapabilityController.forkSession);
+    app.get("/api/assistant/terminals", assistantCapabilityController.listTerminals);
+    app.get("/api/assistant/terminals/:terminalId/history", assistantCapabilityController.readTerminalHistory);
+    app.post("/api/assistant/terminals/:terminalId/input", assistantCapabilityController.sendTerminalInput);
+}
+//# sourceMappingURL=assistant.js.map

package/dist/server/routes/assistant.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assistant.js","sourceRoot":"","sources":["../../../src/routes/assistant.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,GAAoB,EACpB,6BAA4D;IAE5D,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;IACvF,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,6BAA6B,CAAC,YAAY,CAAC,CAAC;IAC/E,GAAG,CAAC,GAAG,CAAC,oCAAoC,EAAE,6BAA6B,CAAC,UAAU,CAAC,CAAC;IACxF,GAAG,CAAC,GAAG,CAAC,6CAA6C,EAAE,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IAC1G,GAAG,CAAC,GAAG,CAAC,oCAAoC,EAAE,6BAA6B,CAAC,UAAU,CAAC,CAAC;IACxF,GAAG,CAAC,GAAG,CAAC,6CAA6C,EAAE,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IAC1G,GAAG,CAAC,GAAG,CAAC,4CAA4C,EAAE,6BAA6B,CAAC,iBAAiB,CAAC,CAAC;IACvG,GAAG,CAAC,IAAI,CAAC,6CAA6C,EAAE,6BAA6B,CAAC,kBAAkB,CAAC,CAAC;IAC1G,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE,6BAA6B,CAAC,WAAW,CAAC,CAAC;IAChG,GAAG,CAAC,GAAG,CAAC,0BAA0B,EAAE,6BAA6B,CAAC,aAAa,CAAC,CAAC;IACjF,GAAG,CAAC,GAAG,CAAC,8CAA8C,EAAE,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IAC3G,GAAG,CAAC,IAAI,CAAC,4CAA4C,EAAE,6BAA6B,CAAC,iBAAiB,CAAC,CAAC;AAC1G,CAAC"}

package/dist/server/routes/debug-targets.d.ts

@@ -0,0 +1,3 @@
+import type { FastifyInstance } from "fastify";
+import type { DebugTargetController } from "../modules/debug-target/debug-target-controller.js";
+export declare function registerDebugTargetRoutes(app: FastifyInstance, debugTargetController: DebugTargetController): Promise<void>;

package/dist/server/routes/debug-targets.js

@@ -0,0 +1,15 @@
+export async function registerDebugTargetRoutes(app, debugTargetController) {
+    app.get("/api/debug-runtimes/:runtimeId", debugTargetController.getRuntime);
+    app.get("/api/debug-targets/:targetId/runtime-latest", debugTargetController.getLatestRuntime);
+    app.get("/api/debug-targets/:targetId/runtimes", debugTargetController.getRuntimeHistory);
+    app.post("/api/debug-targets/analyze", debugTargetController.analyze);
+    app.post("/api/debug-targets/:targetId/launch-plan", debugTargetController.createLaunchPlan);
+    app.post("/api/debug-targets/:targetId/run", debugTargetController.run);
+    app.get("/api/debug-targets/:targetId/framework-analysis", debugTargetController.getFrameworkAnalysis);
+    app.post("/api/ai-fallback-edits/:editId/apply", debugTargetController.applyAiFallbackEdit);
+    app.post("/api/ai-fallback-edits/:editId/reject", debugTargetController.rejectAiFallbackEdit);
+    app.post("/api/ai-fallback-edits/:editId/rollback", debugTargetController.rollbackAiFallbackEdit);
+    app.post("/api/debug-targets/:targetId/framework-analysis/refresh", debugTargetController.refreshFrameworkAnalysis);
+    app.get("/api/framework-compatibility-matrix", debugTargetController.getCompatibilityMatrix);
+}
+//# sourceMappingURL=debug-targets.js.map

package/dist/server/routes/debug-targets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug-targets.js","sourceRoot":"","sources":["../../../src/routes/debug-targets.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,GAAoB,EACpB,qBAA4C;IAE5C,GAAG,CAAC,GAAG,CAAC,gCAAgC,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAC5E,GAAG,CAAC,GAAG,CAAC,6CAA6C,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IAC/F,GAAG,CAAC,GAAG,CAAC,uCAAuC,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAC1F,GAAG,CAAC,IAAI,CAAC,4BAA4B,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACtE,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IAC7F,GAAG,CAAC,IAAI,CAAC,kCAAkC,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC;IACxE,GAAG,CAAC,GAAG,CAAC,iDAAiD,EAAE,qBAAqB,CAAC,oBAAoB,CAAC,CAAC;IACvG,GAAG,CAAC,IAAI,CAAC,sCAAsC,EAAE,qBAAqB,CAAC,mBAAmB,CAAC,CAAC;IAC5F,GAAG,CAAC,IAAI,CAAC,uCAAuC,EAAE,qBAAqB,CAAC,oBAAoB,CAAC,CAAC;IAC9F,GAAG,CAAC,IAAI,CAAC,yCAAyC,EAAE,qBAAqB,CAAC,sBAAsB,CAAC,CAAC;IAClG,GAAG,CAAC,IAAI,CACN,yDAAyD,EACzD,qBAAqB,CAAC,wBAAwB,CAC/C,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,qCAAqC,EAAE,qBAAqB,CAAC,sBAAsB,CAAC,CAAC;AAC/F,CAAC"}

package/dist/server/routes/files.js

@@ -11,5 +11,7 @@ export async function registerFileRoutes(app, fileController) {
     app.get("/api/files/search", fileController.search);
     app.get("/api/files/recent", fileController.getRecent);
     app.get("/api/files/preview", fileController.preview);
+    app.get("/api/files/preview-link", fileController.createPreviewLink);
+    app.get("/preview/files/*", fileController.publicPreview);
 }
 //# sourceMappingURL=files.js.map

package/dist/server/routes/files.js.map

@@ -1 +1 @@
-{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../src/routes/files.ts"],"names":[],"mappings":"AAIA,MAAM,4BAA4B,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAoB,EACpB,cAA8B;IAE9B,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACnD,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACzD,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;IAC1D,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACnD,GAAG,CAAC,IAAI,CACN,mBAAmB,EACnB;QACE,SAAS,EAAE,4BAA4B;KACxC,EACD,cAAc,CAAC,MAAM,CACtB,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,qBAAqB,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACxD,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IACpD,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACvD,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../src/routes/files.ts"],"names":[],"mappings":"AAIA,MAAM,4BAA4B,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAoB,EACpB,cAA8B;IAE9B,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACnD,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACzD,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;IAC1D,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACnD,GAAG,CAAC,IAAI,CACN,mBAAmB,EACnB;QACE,SAAS,EAAE,4BAA4B;KACxC,EACD,cAAc,CAAC,MAAM,CACtB,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,qBAAqB,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACxD,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IACpD,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACvD,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACtD,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACrE,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;AAC5D,CAAC"}

package/dist/server/routes/git.js

@@ -12,6 +12,7 @@ export async function registerGitRoutes(app, gitController) {
     app.post("/api/git/commit/undo", gitController.undoLastCommit);
     app.get("/api/git/history", gitController.getHistory);
     app.get("/api/git/branches", gitController.getBranches);
+    app.get("/api/git/tags", gitController.getTags);
     app.post("/api/git/branches/switch", gitController.switchBranch);
     app.get("/api/git/remotes", gitController.getRemotes);
     app.post("/api/git/remote/sync", gitController.syncRemote);