@jingyi0605/codingns 0.8.5 → 0.9.5

package/dist/server/modules/butler/butler-profile-service.js

@@ -1,4 +1,3 @@
-import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { AppError } from "../../shared/errors/app-error.js";
@@ -39,17 +38,27 @@ export class ButlerProfileService {
         const profile = this.butlerProfileRepository.find();
         return profile ? hydrateStoredProfile(profile) : null;
     }
+    isSetupCompleted() {
+        return this.getProfile()?.setupCompleted === true;
+    }
     initProfile(input) {
-        if (this.butlerProfileRepository.find()) {
-            throw new AppError({
-                statusCode: 409,
-                errorCode: "BUTLER_PROFILE_ALREADY_INITIALIZED",
-                detail: "代码助手已经初始化，不能重复初始化"
-            });
+        const current = this.getProfile();
+        if (current?.setupCompleted) {
+            throw createButlerAlreadyInitializedError();
         }
         const timestamp = nowIso();
-        const profile = buildButlerProfileRecord(input, timestamp, null, this.butlerProjectRepository, this.dataRootDir, this.providerControlRepository);
-        return this.butlerProfileRepository.create(profile);
+        const profile = buildButlerProfileRecord(input, timestamp, current, this.butlerProjectRepository, this.dataRootDir, this.providerControlRepository);
+        try {
+            return current
+                ? this.butlerProfileRepository.update(profile)
+                : this.butlerProfileRepository.create(profile);
+        }
+        catch (error) {
+            if (isSqlitePrimaryKeyConflict(error) && this.isSetupCompleted()) {
+                throw createButlerAlreadyInitializedError();
+            }
+            throw error;
+        }
     }
     updateProfile(input) {
         const current = this.getProfile();
@@ -114,10 +123,26 @@ function buildButlerProfileRecord(input, initializedAt, current, butlerProjectRe
         agentsContent: agentsConfig.agentsContent,
         persona,
         focus,
+        setupCompleted: true,
         initializedAt,
         updatedAt: nowIso()
     };
 }
+function createButlerAlreadyInitializedError() {
+    return new AppError({
+        statusCode: 409,
+        errorCode: "BUTLER_PROFILE_ALREADY_INITIALIZED",
+        detail: "代码助手已经初始化，不能重复初始化"
+    });
+}
+function isSqlitePrimaryKeyConflict(error) {
+    const errorCode = typeof error === "object" && error !== null && "code" in error && typeof error.code === "string"
+        ? error.code
+        : null;
+    return (error instanceof Error
+        && (error.message.includes("UNIQUE constraint failed: butler_profiles.id")
+            || errorCode === "SQLITE_CONSTRAINT_PRIMARYKEY"));
+}
 function normalizeDisplayName(value) {
     if (typeof value !== "string") {
         throw invalidField("displayName", "displayName 必须是非空字符串");
@@ -169,7 +194,6 @@ function finalizeWorkspacePath(targetPath, butlerProjectRepository) {
         throw invalidField("workspacePath", "workspacePath 不能直接复用某个项目仓库目录");
     }
     fs.mkdirSync(resolved, { recursive: true });
-    ensureButlerWorkspaceIsolation(resolved);
     return resolved;
 }
 function normalizeAgentsMode(value) {
@@ -272,59 +296,6 @@ function writeAgentsFile(filePath, content) {
     fs.mkdirSync(path.dirname(filePath), { recursive: true });
     fs.writeFileSync(filePath, `${content.trim()}\n`, "utf8");
 }
-export function ensureButlerWorkspaceIsolation(workspacePath) {
-    const resolvedWorkspacePath = path.resolve(workspacePath);
-    fs.mkdirSync(resolvedWorkspacePath, { recursive: true });
-    if (isSamePath(readGitTopLevel(resolvedWorkspacePath), resolvedWorkspacePath)) {
-        return;
-    }
-    try {
-        // 必须建立真实 git 边界，假 .git 目录挡不住上层仓库规则继承。
-        execFileSync("git", ["-C", resolvedWorkspacePath, "init", "-q"], {
-            stdio: "ignore"
-        });
-    }
-    catch (error) {
-        throw new AppError({
-            statusCode: 500,
-            errorCode: "BUTLER_WORKSPACE_ISOLATION_FAILED",
-            detail: error instanceof Error
-                ? `代码助手工作目录初始化独立 git 边界失败：${error.message}`
-                : "代码助手工作目录初始化独立 git 边界失败"
-        });
-    }
-    if (!isSamePath(readGitTopLevel(resolvedWorkspacePath), resolvedWorkspacePath)) {
-        throw new AppError({
-            statusCode: 500,
-            errorCode: "BUTLER_WORKSPACE_ISOLATION_FAILED",
-            detail: "代码助手工作目录未能建立独立 git 边界"
-        });
-    }
-}
-function readGitTopLevel(workspacePath) {
-    try {
-        const output = execFileSync("git", ["-C", workspacePath, "rev-parse", "--show-toplevel"], {
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"]
-        });
-        const normalized = output.trim();
-        return normalized ? path.resolve(normalized) : null;
-    }
-    catch {
-        return null;
-    }
-}
-function isSamePath(left, right) {
-    if (!left) {
-        return false;
-    }
-    try {
-        return fs.realpathSync.native(left) === fs.realpathSync.native(right);
-    }
-    catch {
-        return path.resolve(left) === path.resolve(right);
-    }
-}
 function normalizePersona(value) {
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
         throw invalidField("persona", "persona 必须是对象");

package/dist/server/modules/butler/butler-profile-service.js.map

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

package/dist/server/modules/butler/butler-project-service.d.ts

@@ -1,5 +1,4 @@
 import type { ButlerProject } from "../../types/domain.js";
-import type { AssistantSandboxWorkspaceRepository } from "../../storage/repositories/assistant-sandbox-workspace-repository.js";
 import type { ButlerProjectRepository } from "../../storage/repositories/butler-project-repository.js";
 import type { ButlerSessionRepository } from "../../storage/repositories/butler-session-repository.js";
 import type { WorkspaceRepository } from "../../storage/repositories/workspace-repository.js";
@@ -25,8 +24,7 @@ export declare class ButlerProjectService {
     private readonly butlerSessionRepository;
     private readonly workspaceRepository;
     private readonly butlerProfileService?;
-    private readonly assistantSandboxWorkspaceRepository?;
-    constructor(butlerProjectRepository: ButlerProjectRepository, butlerSessionRepository: ButlerSessionRepository, workspaceRepository: WorkspaceRepository, butlerProfileService?: Pick<ButlerProfileService, "getProfile"> | undefined, assistantSandboxWorkspaceRepository?: Pick<AssistantSandboxWorkspaceRepository, "listManagedWorkspaceIds"> | undefined);
+    constructor(butlerProjectRepository: ButlerProjectRepository, butlerSessionRepository: ButlerSessionRepository, workspaceRepository: WorkspaceRepository, butlerProfileService?: Pick<ButlerProfileService, "getProfile"> | undefined);
     list(input?: {
         workspaceId?: string;
         lifecycleStatus?: ButlerProject["lifecycleStatus"];

package/dist/server/modules/butler/butler-project-service.js

@@ -8,13 +8,11 @@ export class ButlerProjectService {
     butlerSessionRepository;
     workspaceRepository;
     butlerProfileService;
-    assistantSandboxWorkspaceRepository;
-    constructor(butlerProjectRepository, butlerSessionRepository, workspaceRepository, butlerProfileService, assistantSandboxWorkspaceRepository) {
+    constructor(butlerProjectRepository, butlerSessionRepository, workspaceRepository, butlerProfileService) {
         this.butlerProjectRepository = butlerProjectRepository;
         this.butlerSessionRepository = butlerSessionRepository;
         this.workspaceRepository = workspaceRepository;
         this.butlerProfileService = butlerProfileService;
-        this.assistantSandboxWorkspaceRepository = assistantSandboxWorkspaceRepository;
     }
     list(input) {
         this.syncManagedProjects();
@@ -134,11 +132,7 @@ export class ButlerProjectService {
     syncManagedProjects() {
         const profile = this.butlerProfileService?.getProfile() ?? null;
         const butlerWorkspacePath = profile?.workspacePath ? path.resolve(profile.workspacePath) : null;
-        const sandboxWorkspaceIdSet = new Set(this.assistantSandboxWorkspaceRepository?.listManagedWorkspaceIds() ?? []);
         const activeWorkspaces = this.workspaceRepository.list().filter((workspace) => {
-            if (sandboxWorkspaceIdSet.has(workspace.id)) {
-                return false;
-            }
             if (!butlerWorkspacePath) {
                 return true;
             }

package/dist/server/modules/butler/butler-project-service.js.map

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

package/dist/server/modules/butler/butler-session-service.d.ts

@@ -16,10 +16,14 @@ export interface ButlerProjectSessionView {
     provider: string | null;
     title: string | null;
     isArchived: boolean;
+    isFavorite: boolean;
     role: ButlerSessionRole;
     ownershipMode: ButlerSessionOwnershipMode;
     status: ButlerSessionStatus;
     runningState: SessionRunningState | null;
+    lastEventAt: string | null;
+    completedAt: string | null;
+    lastSeenAt: string | null;
     lastSummary: string | null;
     lastCheckpointAt: string | null;
     createdAt: string;

package/dist/server/modules/butler/butler-session-service.js

@@ -1,3 +1,5 @@
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
 import { AppError, isAppError } from "../../shared/errors/app-error.js";
 import { createId } from "../../shared/utils/id.js";
 import { nowIso } from "../../shared/utils/time.js";
@@ -95,10 +97,14 @@ export class ButlerSessionService {
                     provider: binding?.provider ?? null,
                     title: index?.title ?? null,
                     isArchived,
+                    isFavorite: state?.favorite ?? false,
                     role: record.role,
                     ownershipMode: record.ownershipMode,
                     status: record.status,
                     runningState: state?.runningState ?? null,
+                    lastEventAt: state?.lastEventAt ?? index?.updatedAt ?? record.updatedAt,
+                    completedAt: state?.completedAt ?? (record.status === "closed" ? record.updatedAt : null),
+                    lastSeenAt: state?.lastSeenAt ?? null,
                     lastSummary: record.lastSummary,
                     lastCheckpointAt: record.lastCheckpointAt,
                     createdAt: record.createdAt,
@@ -175,10 +181,14 @@ export class ButlerSessionService {
             provider: binding.provider,
             title: index?.title ?? null,
             isArchived: index?.isArchived ?? false,
+            isFavorite: state?.favorite ?? false,
             role: created.role,
             ownershipMode: created.ownershipMode,
             status: created.status,
             runningState: state?.runningState ?? null,
+            lastEventAt: state?.lastEventAt ?? index?.updatedAt ?? created.updatedAt,
+            completedAt: state?.completedAt ?? (created.status === "closed" ? created.updatedAt : null),
+            lastSeenAt: state?.lastSeenAt ?? null,
             lastSummary: created.lastSummary,
             lastCheckpointAt: created.lastCheckpointAt,
             createdAt: created.createdAt,
@@ -260,10 +270,14 @@ export class ButlerSessionService {
             provider: binding?.provider ?? null,
             title: index?.title ?? null,
             isArchived: index?.isArchived ?? false,
+            isFavorite: state?.favorite ?? false,
             role: updatedRecord.role,
             ownershipMode: updatedRecord.ownershipMode,
             status: updatedRecord.status,
             runningState: state?.runningState ?? null,
+            lastEventAt: state?.lastEventAt ?? index?.updatedAt ?? updatedRecord.updatedAt,
+            completedAt: state?.completedAt ?? (updatedRecord.status === "closed" ? updatedRecord.updatedAt : null),
+            lastSeenAt: state?.lastSeenAt ?? null,
             lastSummary: updatedRecord.lastSummary,
             lastCheckpointAt: updatedRecord.lastCheckpointAt,
             createdAt: updatedRecord.createdAt,
@@ -402,10 +416,14 @@ export class ButlerSessionService {
             provider: providerId,
             title: null,
             isArchived: false,
+            isFavorite: false,
             role: created.role,
             ownershipMode: created.ownershipMode,
             status: created.status,
             runningState: "running",
+            lastEventAt: timestamp,
+            completedAt: null,
+            lastSeenAt: null,
             lastSummary: created.lastSummary,
             lastCheckpointAt: created.lastCheckpointAt,
             createdAt: created.createdAt,
@@ -477,10 +495,14 @@ export class ButlerSessionService {
             provider: candidate.provider,
             title: candidate.title,
             isArchived: candidate.isArchived,
+            isFavorite: candidate.isFavorite,
             role: created.role,
             ownershipMode: created.ownershipMode,
             status: created.status,
             runningState,
+            lastEventAt: candidate.lastEventAt,
+            completedAt: candidate.completedAt,
+            lastSeenAt: candidate.lastSeenAt,
             lastSummary: created.lastSummary,
             lastCheckpointAt: created.lastCheckpointAt,
             createdAt: created.createdAt,
@@ -524,10 +546,14 @@ export class ButlerSessionService {
             provider: binding?.provider ?? null,
             title: index?.title ?? null,
             isArchived: index?.isArchived ?? false,
+            isFavorite: state?.favorite ?? false,
             role: record.role,
             ownershipMode: record.ownershipMode,
             status: record.status,
             runningState: state?.runningState ?? null,
+            lastEventAt: state?.lastEventAt ?? index?.updatedAt ?? record.updatedAt,
+            completedAt: state?.completedAt ?? (record.status === "closed" ? record.updatedAt : null),
+            lastSeenAt: state?.lastSeenAt ?? null,
             lastSummary: record.lastSummary,
             lastCheckpointAt: record.lastCheckpointAt,
             createdAt: record.createdAt,
@@ -548,6 +574,9 @@ export class ButlerSessionService {
                 || Boolean(existing)) {
                 continue;
             }
+            if (!shouldImportObservedSessionIntoProject(project, session)) {
+                continue;
+            }
             const created = this.createObservedSession(project, session, userId);
             if (created) {
                 existingSessionIds.add(session.sessionId);
@@ -712,6 +741,104 @@ function normalizeNullableText(value) {
     const normalized = value?.trim();
     return normalized && normalized.length > 0 ? normalized : null;
 }
+function shouldImportObservedSessionIntoProject(project, session) {
+    const observedWorkspacePath = resolveObservedSessionWorkspacePath(session);
+    if (!observedWorkspacePath) {
+        return true;
+    }
+    return normalizeComparablePath(observedWorkspacePath) === normalizeComparablePath(project.repoRoot);
+}
+function resolveObservedSessionWorkspacePath(session) {
+    const rawStoreRef = session.rawStoreRef?.trim() ?? "";
+    if (!rawStoreRef || !existsSync(rawStoreRef)) {
+        return null;
+    }
+    try {
+        switch (session.provider) {
+            case "codex":
+                return readCodexObservedWorkspacePath(rawStoreRef, session.providerSessionId);
+            case "claude-code":
+                return readClaudeObservedWorkspacePath(rawStoreRef);
+            default:
+                return null;
+        }
+    }
+    catch {
+        return null;
+    }
+}
+function readCodexObservedWorkspacePath(rawStoreRef, providerSessionId) {
+    const lines = readLimitedJsonLines(rawStoreRef, 80);
+    const sessionMetaRecord = lines.find((record) => record?.type === "session_meta");
+    const metaPayload = isRecord(sessionMetaRecord?.payload) ? sessionMetaRecord.payload : null;
+    const metaCwd = ensureNonEmptyText(metaPayload?.cwd);
+    if (metaCwd) {
+        return metaCwd;
+    }
+    const matchingCodexSessionRecord = lines.find((record) => {
+        const payload = isRecord(record?.payload) ? record.payload : null;
+        return record?.type === "session_meta"
+            && ensureNonEmptyText(payload?.id) === providerSessionId;
+    });
+    const matchingPayload = isRecord(matchingCodexSessionRecord?.payload)
+        ? matchingCodexSessionRecord.payload
+        : null;
+    const matchingCwd = ensureNonEmptyText(matchingPayload?.cwd);
+    if (matchingCwd) {
+        return matchingCwd;
+    }
+    for (const record of lines) {
+        if (record?.type !== "event_msg") {
+            continue;
+        }
+        const payload = isRecord(record.payload) ? record.payload : null;
+        const cwd = ensureNonEmptyText(payload?.cwd);
+        if (cwd) {
+            return cwd;
+        }
+    }
+    return null;
+}
+function readClaudeObservedWorkspacePath(rawStoreRef) {
+    const lines = readLimitedJsonLines(rawStoreRef, 80);
+    for (const record of lines) {
+        const cwd = ensureNonEmptyText(record?.cwd);
+        if (cwd) {
+            return cwd;
+        }
+    }
+    return null;
+}
+function readLimitedJsonLines(rawStoreRef, maxLines) {
+    const content = readFileSync(rawStoreRef, "utf8");
+    const lines = content
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0)
+        .slice(0, Math.max(1, maxLines));
+    const records = [];
+    for (const line of lines) {
+        try {
+            const parsed = JSON.parse(line);
+            if (isRecord(parsed)) {
+                records.push(parsed);
+            }
+        }
+        catch {
+            continue;
+        }
+    }
+    return records;
+}
+function normalizeComparablePath(value) {
+    return path.resolve(value).replace(/[\\/]+$/g, "");
+}
+function ensureNonEmptyText(value) {
+    return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null;
+}
 function buildManagedSessionTitle(content) {
     const title = content.trim().replace(/\s+/g, " ");
     return title.slice(0, 48) || "继续对话";