@nowcrew/daemon 0.6.39 → 0.6.40

package/dist/execution-runner.js

@@ -501,6 +501,19 @@ export async function runExecution(config, input, dependencies) {
         let projectContext;
         let sessionContextFingerprint;
         const logicalProjectContext = spec.workspace.projectContext;
+        dslog("project_dependencies.preflight", "项目依赖准备前置状态", {
+            execution_id: spec.executionId,
+            agent_handle: spec.agent.handle,
+            has_ability_release: spec.agent.abilityRelease !== undefined,
+            ability_release_id: spec.agent.abilityRelease?.releaseId,
+            ability_root_commit: spec.agent.abilityRelease?.rootCommit,
+            has_project_context: logicalProjectContext !== undefined,
+            project_ids: JSON.stringify(logicalProjectContext?.projectIds ?? []),
+            project_context_primary: logicalProjectContext?.primaryProjectId,
+            dependency_prepare_expected: spec.agent.abilityRelease !== undefined
+                && logicalProjectContext !== undefined
+                && logicalProjectContext.projectIds.length > 0,
+        });
         if (logicalProjectContext !== undefined && logicalProjectContext.projectIds.length > 0) {
             const projectSnapshot = {
                 projectIds: logicalProjectContext.projectIds,
@@ -532,6 +545,25 @@ export async function runExecution(config, input, dependencies) {
                     });
                 }
             }
+            else if (spec.agent.abilityRelease === undefined) {
+                dslog("project_dependencies.skipped", "缺少 abilityRelease，未执行项目依赖准备", {
+                    level: "WARN",
+                    execution_id: spec.executionId,
+                    agent_handle: spec.agent.handle,
+                    project_ids: JSON.stringify(projectSnapshot.projectIds),
+                    reason: "ability_release_missing",
+                });
+            }
+            else {
+                dslog("project_dependencies.skipped", "Daemon 未提供项目依赖准备器", {
+                    level: "WARN",
+                    execution_id: spec.executionId,
+                    agent_handle: spec.agent.handle,
+                    project_ids: JSON.stringify(projectSnapshot.projectIds),
+                    ability_release_id: spec.agent.abilityRelease.releaseId,
+                    reason: "provisioner_missing",
+                });
+            }
             projectContext = await cancellable(resolveProjectContext(projectSnapshot, projectWorkspaceRegistry), dependencies.cancellation);
             sessionContextFingerprint = projectSessionContextFingerprint(spec.runtime.name, projectSnapshot);
         }

package/dist/local-executor.js

@@ -491,6 +491,27 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
         const childEnv = runtime.name === "deepseek-harness"
             ? applyDeepSeekHarnessMachineEnv(providerEnv, inheritedEnv)
             : providerEnv;
+        dslog("runtime.environment_contract", "Runtime 子进程环境契约", {
+            execution_id: input.executionId,
+            agent_handle: input.handle,
+            runtime: runtime.name,
+            qa_runtime_root: childEnv.QA_RUNTIME_ROOT ?? null,
+            qa_runtime_root_present: childEnv.QA_RUNTIME_ROOT !== undefined,
+            inherited_qa_runtime_root_present: inheritedEnv.QA_RUNTIME_ROOT !== undefined,
+            training_root: join(workspace.dir, "training"),
+            project_context_present: input.projectContext !== undefined,
+            project_ids: JSON.stringify(input.projectContext === undefined
+                ? []
+                : [
+                    ...(input.projectContext.primary === undefined
+                        ? []
+                        : [input.projectContext.primary.projectId]),
+                    ...input.projectContext.secondary.map((project) => project.projectId),
+                ]),
+            ability_release_present: input.abilityRelease !== undefined,
+            ability_release_id: input.abilityRelease?.releaseId,
+            ability_root_commit: input.abilityRelease?.rootCommit,
+        });
         const launchRuntime = dependencies.launchRuntime ?? launchLegacyRuntime;
         if (dependencies.cancellation?.isRequested())
             throw new RuntimeCancelledError();

package/dist/project-dependencies.js

@@ -4,6 +4,7 @@ import { dirname, join, resolve, sep } from "node:path";
 import { promisify } from "node:util";
 import { parse } from "yaml";
 import { validateAbilityGitHost } from "./agent-ability/resolver.js";
+import { dslog } from "./slog.js";
 import { PROJECT_BRANCH, PROJECT_BRANCH_FORBIDDEN, PROJECT_MANIFEST_SOURCE_PATH, ProjectDependencyManifestSchema, } from "./project-dependency-manifest.js";
 const runFile = promisify(execFile);
 const PROJECT_MANIFEST_RELATIVE_PATH = PROJECT_MANIFEST_SOURCE_PATH;
@@ -130,12 +131,19 @@ async function checkoutProject(git, project, branch, target) {
         }
     }
     try {
-        return {
-            resolvedCommit: await git.run(["rev-parse", "HEAD"], target),
-            created,
-        };
+        if (project.commit !== undefined) {
+            await git.run(["checkout", "--force", "--detach", project.commit], target);
+        }
+        const resolvedCommit = await git.run(["rev-parse", "HEAD"], target);
+        if (project.commit !== undefined && resolvedCommit !== project.commit) {
+            throw new ProjectDependencyError("project_dependency_commit_mismatch", `project ${project.id} resolved to an unexpected commit`, project.id);
+        }
+        return { resolvedCommit, created };
     }
     catch {
+        if (project.commit !== undefined) {
+            throw new ProjectDependencyError("project_dependency_commit_mismatch", `project ${project.id} could not be checked out at the requested commit`, project.id);
+        }
         throw new ProjectDependencyError("project_dependency_checkout_failed", "checkout commit cannot be resolved", project.id);
     }
 }
@@ -195,8 +203,17 @@ export function createProjectDependencyProvisioner(options) {
     return {
         async prepare(input) {
             const manifest = await readProjectManifest(input.trainingRoot);
-            if (manifest === null || input.projectIds.length === 0)
+            dslog("project_dependencies.manifest", "读取项目依赖清单", {
+                training_root: input.trainingRoot,
+                manifest_present: manifest !== null,
+                requested_project_ids: JSON.stringify(input.projectIds),
+                declared_project_ids: JSON.stringify(manifest?.projects.map((project) => project.id) ?? []),
+            });
+            if (input.projectIds.length === 0)
                 return Object.freeze([]);
+            if (manifest === null) {
+                throw new ProjectDependencyError("project_dependency_manifest_missing", "project dependency manifest is missing from the active training package");
+            }
             if (!isWithin(input.trainingRoot, projectManifestPath(input.trainingRoot))) {
                 throw new ProjectDependencyError("project_dependency_manifest_invalid", "project manifest path escapes training root");
             }
@@ -237,6 +254,7 @@ export function createProjectDependencyProvisioner(options) {
                     repo: project.repo,
                     branch,
                     branchSource,
+                    ...(project.commit === undefined ? {} : { requestedCommit: project.commit }),
                     resolvedCommit: checkout.resolvedCommit,
                     checkoutMode: "shared",
                     localRoot: root,

package/dist/project-dependency-manifest.js

@@ -5,10 +5,12 @@ export const PROJECT_MANIFEST_SOURCE_PATH = "workspace/project-dependencies.yaml
 export const PROJECT_BRANCH = /^[A-Za-z0-9][A-Za-z0-9._/-]{0,255}$/u;
 export const PROJECT_BRANCH_FORBIDDEN = /(?:^|\/)\.\.?(?:\/|$)|[\s\p{Cc}\\]/u;
 export const PROJECT_SUMMARY_MAX_LENGTH = 1_000;
+export const PROJECT_COMMIT = /^[a-f0-9]{40}$/u;
 const ProjectDependencySchema = z.object({
     id: z.string().min(1).max(64),
     repo: AbilityRepositoryUrlSchema,
     branch: z.string().min(1).max(256).optional(),
+    commit: z.string().optional(),
     summary: z.string().min(1).max(PROJECT_SUMMARY_MAX_LENGTH),
 }).strict().superRefine((project, ctx) => {
     if (!isProjectId(project.id)) {
@@ -18,6 +20,9 @@ const ProjectDependencySchema = z.object({
         && (!PROJECT_BRANCH.test(project.branch) || PROJECT_BRANCH_FORBIDDEN.test(project.branch))) {
         ctx.addIssue({ code: z.ZodIssueCode.custom, path: ["branch"], message: "invalid project branch" });
     }
+    if (project.commit !== undefined && !PROJECT_COMMIT.test(project.commit)) {
+        ctx.addIssue({ code: z.ZodIssueCode.custom, path: ["commit"], message: "invalid project commit" });
+    }
 });
 export const ProjectDependencyManifestSchema = z.object({
     version: z.literal(1),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.39",
+  "version": "0.6.40",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -16,14 +16,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "daemon": "pnpm --filter @nowcrew/cli build && tsx src/main.ts",
-    "build": "tsc -p tsconfig.json",
-    "codex-home:migrate": "tsx src/runtimes/codex-home-migration-cli.ts",
-    "prepublishOnly": "pnpm build && node ../scripts/daemon-release-artifact.mjs --strict-registry",
-    "test": "vitest run",
-    "typecheck": "tsc --noEmit"
-  },
   "dependencies": {
     "@agentclientprotocol/sdk": "1.2.1",
     "@nowcrew/cli": "^0.4.13",
@@ -42,5 +34,12 @@
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0"
+  },
+  "scripts": {
+    "daemon": "pnpm --filter @nowcrew/cli build && tsx src/main.ts",
+    "build": "tsc -p tsconfig.json",
+    "codex-home:migrate": "tsx src/runtimes/codex-home-migration-cli.ts",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit"
   }
-}
+}