@nowcrew/daemon 0.6.85 → 0.6.87-beta.1

package/dist/agent-ability/resolver.js

@@ -78,6 +78,28 @@ const git = async (args, cwd) => {
     });
     return result.stdout.trim();
 };
+export const parseAbilityRefLine = (line) => {
+    const [branch, commit, rawTime, ...extra] = line.split("\t");
+    const time = Number(rawTime);
+    if (!branch || !commit || extra.length > 0 || !Number.isSafeInteger(time)) {
+        throw new Error("ability_release_ref_metadata_invalid");
+    }
+    return { branch, commit, time };
+};
+export const selectAbilityRef = (lines, branchGlob, desiredCommit) => {
+    const refs = lines.filter(Boolean).map(parseAbilityRefLine)
+        .filter((candidate) => matchesAbilityBranch(branchGlob, candidate.branch));
+    if (refs.length === 0)
+        throw new Error("ability_release_branch_not_found");
+    const selected = refs.filter((candidate) => desiredCommit === undefined || candidate.commit === desiredCommit)
+        .sort((left, right) => right.time - left.time || right.branch.localeCompare(left.branch))[0];
+    if (!selected)
+        throw new Error("ability_desired_commit_not_found");
+    const committedDate = new Date(selected.time * 1_000);
+    return Number.isNaN(committedDate.getTime())
+        ? selected
+        : { ...selected, committedAt: committedDate.toISOString() };
+};
 export const projectDependencyIds = (files, manifest) => {
     const path = manifest.spec.git?.projectDependencies.path;
     if (path === undefined)
@@ -209,17 +231,10 @@ const resolveRoot = async (cacheRoot, repositoryUrl, branchGlob, desiredCommit)
     else
         await git(["--git-dir", bare, "remote", "set-url", "origin", repositoryUrl]);
     await git(["--git-dir", bare, "fetch", "--no-tags", "--prune", "origin", "+refs/heads/*:refs/remotes/origin/*"]);
-    const refs = (await git(["--git-dir", bare, "for-each-ref", "--format=%(refname:strip=3)\t%(objectname)\t%(committerdate:unix)", "refs/remotes/origin"])).split("\n")
-        .filter(Boolean).map((line) => {
-        const [branch, commit, time] = line.split("\t");
-        return { branch: branch, commit: commit, time: Number(time) };
-    }).filter((candidate) => matchesAbilityBranch(branchGlob, candidate.branch));
-    if (refs.length === 0)
-        throw new Error("ability_release_branch_not_found");
-    const selected = refs.filter((candidate) => desiredCommit === undefined || candidate.commit === desiredCommit)
-        .sort((left, right) => right.time - left.time || right.branch.localeCompare(left.branch))[0];
-    if (!selected)
-        throw new Error("ability_desired_commit_not_found");
+    const selected = selectAbilityRef((await git([
+        "--git-dir", bare, "for-each-ref",
+        "--format=%(refname:strip=3)\t%(objectname)\t%(committerdate:unix)", "refs/remotes/origin",
+    ])).split("\n"), branchGlob, desiredCommit);
     const root = join(cacheRoot, "artifacts", repositoryKey, selected.commit);
     try {
         await lstat(root);
@@ -440,7 +455,9 @@ export async function resolveAbilityRelease(agentsRoot, command) {
     }
     const projectDependencies = projectDependencyIds(files, manifest);
     return {
-        branch: resolved.branch, rootCommit: resolved.commit, treeDigest: resolved.treeDigest,
+        branch: resolved.branch, rootCommit: resolved.commit,
+        ...(resolved.committedAt ? { committedAt: resolved.committedAt } : {}),
+        treeDigest: resolved.treeDigest,
         artifactDigest, schemaVersion: manifest.apiVersion, manifest, lock, assetSummary,
         scanSummary: { passed: security.findings.length === 0, blockingFindings: security.findings.length, findings: security.findings.slice(0, 100) },
         evalSummary: { passed: assertions.every((assertion) => assertion.passed), assertions },

package/dist/cloud-report-upload.js

@@ -0,0 +1,50 @@
+import { existsSync, readFileSync } from "node:fs";
+import { homedir, hostname, platform } from "node:os";
+import { join } from "node:path";
+const ALIYUN_MARKER = /alibaba|aliyun|alicloud/iu;
+function readMarker(path) {
+    try {
+        return readFileSync(path, "utf8");
+    }
+    catch {
+        return "";
+    }
+}
+export function detectCloudProvider(env = process.env, platformName = platform(), hostName = hostname(), readMarkerValue = readMarker) {
+    const explicit = env.CREW_CLOUD_PROVIDER?.trim().toLowerCase();
+    if (explicit === "aliyun" || explicit === "alibaba" || explicit === "alicloud")
+        return "aliyun";
+    if (explicit !== undefined && explicit !== "")
+        return "unknown";
+    if (ALIYUN_MARKER.test(hostName))
+        return "aliyun";
+    if (platformName !== "linux")
+        return "unknown";
+    const markers = [
+        "/sys/class/dmi/id/sys_vendor",
+        "/sys/class/dmi/id/product_name",
+        "/sys/class/dmi/id/board_vendor",
+    ];
+    return markers.some((path) => ALIYUN_MARKER.test(readMarkerValue(path))) ? "aliyun" : "unknown";
+}
+export function findOssUploadScript(env = process.env, exists = existsSync) {
+    const explicit = env.CREW_OSS_UPLOAD_SCRIPT?.trim();
+    if (explicit)
+        return exists(explicit) ? explicit : undefined;
+    const home = env.HOME?.trim() || homedir();
+    const candidates = [
+        join(home, ".claude", "skills", "oss-upload", "scripts", "oss_upload.py"),
+        join(home, ".codex", "skills", "oss-upload", "scripts", "oss_upload.py"),
+        join(home, ".agents", "skills", "oss-upload", "scripts", "oss_upload.py"),
+    ];
+    return candidates.find(exists);
+}
+export function cloudReportUploadFacts(env = process.env, platformName = platform(), hostName = hostname(), readMarkerValue, exists) {
+    const provider = detectCloudProvider(env, platformName, hostName, readMarkerValue);
+    const ossUploadScript = provider === "aliyun" ? findOssUploadScript(env, exists) : undefined;
+    return Object.freeze({
+        provider,
+        ...(ossUploadScript === undefined ? {} : { ossUploadScript }),
+        enabled: provider === "aliyun" && ossUploadScript !== undefined,
+    });
+}

package/dist/cloud-report-uploader.js

@@ -0,0 +1,205 @@
+import { execFile } from "node:child_process";
+import { lstat, readdir } from "node:fs/promises";
+import { extname, join, relative, resolve, sep } from "node:path";
+import { promisify } from "node:util";
+import { cloudReportUploadFacts } from "./cloud-report-upload.js";
+import { dslog } from "./slog.js";
+const execFileP = promisify(execFile);
+const REPORT_FILENAMES = new Set(["report.md", "result.json"]);
+const MAX_DEPTH = 8;
+const MAX_FILES = 100;
+const OSS_URL_HOST = "ai-claw-in.nowcoder.com";
+const fileFingerprint = async (path) => {
+    const stat = await lstat(path);
+    return `${stat.size}:${stat.mtimeMs}`;
+};
+function isReportFile(root, path) {
+    const parts = relative(root, path).split(sep).filter(Boolean);
+    const filename = parts.at(-1) ?? "";
+    if (parts[0] === "tasks" && parts.length >= 3) {
+        return REPORT_FILENAMES.has(filename) || extname(filename).toLowerCase() === ".html";
+    }
+    if (parts[0] !== "qa-report-server-v2")
+        return false;
+    if (parts[1] === "static" && parts.length === 3)
+        return extname(filename).toLowerCase() === ".html";
+    if (parts[1] === "qa-results" && parts.length >= 4) {
+        return REPORT_FILENAMES.has(filename) || extname(filename).toLowerCase() === ".html";
+    }
+    return false;
+}
+async function walkReports(root, directory, depth, output) {
+    if (depth > MAX_DEPTH || output.length >= MAX_FILES)
+        return;
+    const entries = await readdir(directory, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) {
+        if (output.length >= MAX_FILES)
+            return;
+        if (entry.name === ".git" || entry.name === "node_modules" || entry.name === ".home")
+            continue;
+        const path = join(directory, entry.name);
+        if (entry.isDirectory()) {
+            await walkReports(root, path, depth + 1, output);
+        }
+        else if (entry.isFile() && isReportFile(root, path)) {
+            output.push(resolve(path));
+        }
+    }
+}
+export async function snapshotReportFiles(root) {
+    const files = [];
+    const workspaceRoot = resolve(root);
+    for (const directory of [
+        join(workspaceRoot, "tasks"),
+        join(workspaceRoot, "qa-report-server-v2", "qa-results"),
+        join(workspaceRoot, "qa-report-server-v2", "static"),
+    ]) {
+        await walkReports(workspaceRoot, directory, 0, files);
+    }
+    const entries = await Promise.all(files.map(async (path) => [path, await fileFingerprint(path)]));
+    return new Map(entries);
+}
+export async function discoverReportFiles(root, before) {
+    const after = await snapshotReportFiles(root);
+    return [...after.entries()]
+        .filter(([path, fingerprint]) => before.get(path) !== fingerprint)
+        .map(([path]) => path)
+        .sort((left, right) => left.localeCompare(right));
+}
+function validOssUrl(value) {
+    if (typeof value !== "string")
+        return false;
+    try {
+        const url = new URL(value);
+        return url.protocol === "https:"
+            && url.hostname === OSS_URL_HOST
+            && !url.username && !url.password && !url.search && !url.hash
+            && url.pathname.length > 1;
+    }
+    catch {
+        return false;
+    }
+}
+async function verifyOssUrl(url) {
+    try {
+        const head = await fetch(url, { method: "HEAD", redirect: "error" });
+        if (head.ok)
+            return true;
+        const ranged = await fetch(url, {
+            method: "GET",
+            headers: { range: "bytes=0-0" },
+            redirect: "error",
+        });
+        return ranged.ok;
+    }
+    catch {
+        return false;
+    }
+}
+export async function uploadCloudReports(input) {
+    const files = await discoverReportFiles(input.root, input.before);
+    if (files.length === 0)
+        return { urls: [], failures: [] };
+    const run = input.execFile ?? (async (file, args) => {
+        const env = Object.fromEntries(Object.entries(process.env).filter(([key]) => (key === "PATH" || key === "HOME" || key.startsWith("CLAUDE_OSS_"))));
+        const result = await execFileP(file, [...args], {
+            env, maxBuffer: 2 * 1024 * 1024, timeout: 300_000,
+        });
+        return { stdout: result.stdout, stderr: result.stderr };
+    });
+    const result = await run("python3", [input.script, ...files, "--prefix", "nowcrew/reports", "--json"]);
+    let records;
+    try {
+        records = JSON.parse(result.stdout);
+    }
+    catch {
+        throw new Error("cloud_report_upload_invalid_json");
+    }
+    if (!Array.isArray(records))
+        throw new Error("cloud_report_upload_invalid_result");
+    const urls = [];
+    const failures = [];
+    const verify = input.verifyUrl ?? verifyOssUrl;
+    for (const file of files) {
+        const record = records.find((candidate) => (candidate && typeof candidate === "object" && "file" in candidate && candidate.file === file));
+        const url = record && typeof record === "object" && "url" in record ? record.url : undefined;
+        const success = record && typeof record === "object" && "success" in record && record.success === true;
+        if (success && validOssUrl(url) && await verify(url))
+            urls.push(url);
+        else
+            failures.push(file);
+    }
+    return { urls, failures };
+}
+export async function prepareCloudReportSnapshot(facts, root) {
+    if (!facts.enabled)
+        return null;
+    return snapshotReportFiles(root);
+}
+export async function prepareCloudReportExecution(input) {
+    const facts = cloudReportUploadFacts(input.env);
+    if (facts.provider !== "aliyun")
+        return { facts, snapshot: null };
+    if (facts.ossUploadScript === undefined) {
+        dslog("cloud_report_upload.unavailable", "阿里云机器未找到 OSS 上传脚本", {
+            level: "WARN", execution_id: input.executionId, agent_handle: input.agentHandle,
+        });
+        return { facts, snapshot: null };
+    }
+    try {
+        return { facts, snapshot: await prepareCloudReportSnapshot(facts, input.root) };
+    }
+    catch (error) {
+        dslog("cloud_report_upload.snapshot_failed", "报告文件快照失败", {
+            level: "WARN",
+            execution_id: input.executionId,
+            agent_handle: input.agentHandle,
+            error_message: error instanceof Error ? error.message.slice(0, 500) : String(error).slice(0, 500),
+        });
+        return { facts, snapshot: null };
+    }
+}
+export function appendReportLinks(value, urls) {
+    const unique = [...new Set(urls)].filter(Boolean);
+    if (unique.length === 0)
+        return value;
+    const suffix = `\n\n报告链接：\n${unique.map((url) => `- ${url}`).join("\n")}`;
+    const closeAt = value.lastIndexOf("</nowwork_external_answer>");
+    return closeAt >= 0
+        ? `${value.slice(0, closeAt)}${suffix}${value.slice(closeAt)}`
+        : `${value}${suffix}`;
+}
+export async function deliverCloudReports(input) {
+    if (!input.facts.enabled || input.facts.ossUploadScript === undefined || input.before === null) {
+        return { finalText: input.finalText, externalAnswer: input.externalAnswer };
+    }
+    try {
+        const result = await (input.upload ?? uploadCloudReports)({
+            script: input.facts.ossUploadScript,
+            root: input.root,
+            before: input.before,
+        });
+        if (result.failures.length > 0) {
+            dslog("cloud_report_upload.partial_failure", "部分报告文件上传失败", {
+                level: "WARN", execution_id: input.executionId, agent_handle: input.agentHandle,
+                uploaded_count: result.urls.length, failed_count: result.failures.length,
+            });
+        }
+        return {
+            finalText: input.captureFinal && result.urls.length > 0
+                ? appendReportLinks(input.finalText ?? "", result.urls)
+                : input.finalText,
+            externalAnswer: input.captureFinal && result.urls.length > 0
+                ? appendReportLinks(input.externalAnswer ?? "", result.urls)
+                : input.externalAnswer,
+            result,
+        };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message.slice(0, 500) : String(error).slice(0, 500);
+        dslog("cloud_report_upload.failed", "报告上传失败", {
+            level: "WARN", execution_id: input.executionId, agent_handle: input.agentHandle, error_message: message,
+        });
+        return { finalText: input.finalText, externalAnswer: input.externalAnswer };
+    }
+}

package/dist/local-executor.js

@@ -11,6 +11,7 @@ import { materializePrivateCodexHome } from "./codex-home-launch.js";
 import { spawnKimi, KIMI_EFFORT_LEVELS } from "./runtimes/kimi.js";
 import { applyDeepSeekHarnessMachineEnv, applyProviderEnv, providerFingerprint, } from "./provider-env.js";
 import { augmentedPath } from "./runtime-path.js";
+import { deliverCloudReports, prepareCloudReportExecution } from "./cloud-report-uploader.js";
 import { extractFinalText, extractRunMeta, normalizeEvent, parseLine, } from "./normalize.js";
 import { readSession, writeSession, pickResumeId, isNearBudget } from "./session.js";
 import { providerErrorFromExit } from "./provider-error.js";
@@ -252,8 +253,10 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
     let executionWorkspace = workspace;
     let localMemoryTelemetry = null;
     const inheritedEnv = { ...process.env };
+    const cloudReportPreparation = await prepareCloudReportExecution({ env: inheritedEnv, root: workspace.dir, executionId: input.executionId, agentHandle: input.handle });
+    const { facts: cloudReportUpload, snapshot: reportSnapshot } = cloudReportPreparation;
     for (const key of Object.keys(inheritedEnv)) {
-        if (key.startsWith("CREW_AGENT_MEMORY_"))
+        if (key.startsWith("CREW_AGENT_MEMORY_") || ["CREW_CLOUD_PROVIDER", "CREW_OSS_UPLOAD_SCRIPT", "CREW_OSS_REPORT_UPLOAD"].includes(key))
             delete inheritedEnv[key];
     }
     const sourceCodexHome = inheritedEnv.CODEX_HOME
@@ -510,6 +513,8 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
             inherited_qa_runtime_root_present: inheritedEnv.QA_RUNTIME_ROOT !== undefined,
             ...packageManagerEnvFacts(childEnv),
             training_root: join(crewHome, "training"),
+            cloud_provider: cloudReportUpload.provider,
+            oss_report_upload_enabled: cloudReportUpload.enabled,
             project_context_present: input.projectContext !== undefined,
             project_ids: JSON.stringify(input.projectContext === undefined
                 ? []
@@ -983,6 +988,16 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
                 await writeFile(legacyCwdMarker, "1", "utf8");
             }
         }
+        const cloudReportResult = exitCode === 0
+            ? await deliverCloudReports({
+                facts: cloudReportUpload, root: workspace.dir, before: reportSnapshot, finalText,
+                externalAnswer: externalOutput.lastClosedBlock
+                    ?? (finalText === null ? null : extractExternalAnswer(finalText)),
+                captureFinal: input.captureFinal, executionId: input.executionId, agentHandle: input.handle,
+                ...(dependencies.uploadCloudReports === undefined ? {} : { upload: dependencies.uploadCloudReports }),
+            })
+            : { finalText, externalAnswer: externalOutput.lastClosedBlock
+                    ?? (finalText === null ? null : extractExternalAnswer(finalText)) };
         memoryPruneExecutorCompleted = true;
         localMemoryTelemetry?.markExecutorCompleted();
         return {
@@ -997,18 +1012,10 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
             sessionId,
             errorMessage: errorTail || null,
             ...(providerError === undefined ? {} : { providerError }),
-            finalText: input.captureFinal && finalText !== null
-                ? stripExternalAnswerMarkers(finalText)
-                : null,
-            // 契约答案 = 整轮最后一个闭合的标签块(六个 runtime 语义一致的"后到者胜",半截块与
-            // 叙述里的开标签不算数);从未闭合过时才回落到对 finalText 的宽容提取,保住"收尾被
-            // 截断"这一老兜底。注意这放宽了"externalAnswer 非空
-            // ⇒ finalText 非空"的旧不变式;是否上报仍由 execution-runner 按 exitCode===0 把关。
-            externalAnswer: input.captureFinal
-                ? (externalOutput.lastClosedBlock !== null
-                    ? externalOutput.lastClosedBlock
-                    : finalText !== null ? extractExternalAnswer(finalText) : null)
+            finalText: input.captureFinal && cloudReportResult.finalText !== null
+                ? stripExternalAnswerMarkers(cloudReportResult.finalText)
                 : null,
+            externalAnswer: input.captureFinal ? cloudReportResult.externalAnswer : null,
             sentViaCrew,
         };
     }

package/dist/storage-worker-executor.js

@@ -95,7 +95,7 @@ export function createStorageWorkerServiceLifecycle(operation, injected = {}) {
     const targetRegistry = { userHome: operation.service.userHome, localHome: targetLocalHome };
     const sourceRecord = operation.service.sourceRecord;
     const targetRecord = operation.service.targetRecord;
-    const sourceSpec = serviceSpec(operation, sourceRecord, operation.migration.sourceRoots["daemon-home"], "source");
+    const sourceSpec = serviceSpec(operation, sourceRecord, operation.migration.sourceRoots["daemon-home"]);
     const targetSpec = serviceSpec(operation, targetRecord, operation.installation.configRoot);
     assertRecordMatchesSpec(sourceRecord, sourceSpec);
     assertRecordMatchesSpec(targetRecord, targetSpec);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.85",
+  "version": "0.6.87-beta.1",
   "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",
@@ -44,5 +36,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"
   }
-}
+}