dsh-openwrite 0.2.17 → 0.2.19

package/release/runtime-manifest.json

@@ -3,7 +3,7 @@
   "dsh": "0.1.2-rc.1",
   "uv_version": "0.11.19",
   "python_version": "3.12.13",
-  "core_version": "5.8.8",
+  "core_version": "5.8.9",
   "contract_version": 1,
   "platforms": {
     "darwin-arm64": {
@@ -56,8 +56,8 @@
     }
   },
   "wheel": {
-    "file": "openwrite-5.8.8-py3-none-any.whl",
-    "sha256": "9a3f68af9a0f41d2477d5acecb48ac0067b1e9ed7df419234ae26c0fbe1ca58e"
+    "file": "openwrite-5.8.9-py3-none-any.whl",
+    "sha256": "9526a78dde66a81a0eb7dedc1454c8dd436e42d966b5b043d13c24e263104341"
   },
   "requirements": {
     "file": "requirements.lock",
@@ -67,12 +67,15 @@
     "core": {
       "repository": "https://github.com/LiPu-jpg/Openwrite",
       "branch": "native-core",
-      "commit": "a7f4d8769de7496cb18b9d6dc38872c60fa5517a"
+      "commit": "d0a75e30047c28c99af909e1b85b07190abb1fb7"
     },
     "dog": {
       "repository": "https://github.com/Fun10165/dsh-dog",
       "tag": "v1.2.0",
-      "commit": "3a442ef4b1a82cc4258a01baf798913c94a99445"
+      "commit": "3a442ef4b1a82cc4258a01baf798913c94a99445",
+      "patches": [
+        "0.2.19: src/host-shims.ts 内置 dshHomePath/defineTool，移除 @deepseek-ai/dsh-home-paths 与 @deepseek-ai/dsh-tools 的运行时导入（#74）"
+      ]
     },
     "cryptography": {
       "package": "cryptography",

package/release/source.json

@@ -1,10 +1,10 @@
 {
   "repository": "https://github.com/LiPu-jpg/Openwrite",
-  "commit": "de2cacb91aa5d530db6d9f8f4dc80afa905bfeb2",
-  "tree": "9d402deae8f9b3f9b80901c8e5c85cba2bf8f75e",
+  "commit": "e0c1ab7998eb3b33738827d5a8f12dd3bb2e9224",
+  "tree": "108c492a309f5c0b46bf59deefb8615f0c2efb66",
   "dirty": false,
   "acquisition": "git-checkout",
-  "sourceTreeSha256": "0157201c7a889ffb27f147c8aebced7df521890714a4ea564bc4fd6e99415e35",
+  "sourceTreeSha256": "5d5b731c6afdf6ddae188a906382a6c2030f76561f81d3c02bb1d982cbb75a31",
   "components": [
     {
       "name": "@deepseek-ai/schemastery",

package/vendor/dsh-dog/lib/core.js

@@ -1,2 +1,2 @@
-import { n as resolveScriptPath, t as DogEngine } from "./core-DdfMcrB4.js";
+import { n as resolveScriptPath, t as DogEngine } from "./core-BAlgZpLq.js";
 export { DogEngine, resolveScriptPath };

package/vendor/dsh-dog/lib/index.d.ts

@@ -1,7 +1,7 @@
 import { $ as VerifierShape, A as FailurePolicy, B as GoalRuntimeTrace, C as ConstraintKind, D as DogConfig, E as DependencyEdge, F as GoalNodeInput, G as JsonPrimitive, H as GoalState, I as GoalResult, J as NotExpr, K as JsonValue, L as GoalRuntimeError, M as GoalAgentSessionRef, N as GoalId, O as DogGraphInput, P as GoalKind, Q as VerificationRecord, R as GoalRuntimeEvent, S as CompiledGraph, T as DOG_SCHEMA_VERSION, U as GraphLimits, V as GoalRuntimeVerifier, W as GraphValidationReport, X as RootTerminalState, Y as RefExpr, Z as RunInvocationContext, _ as AtLeastExpr, b as CiGoalReport, c as AgenticRunner, d as runPlan, et as isJsonValue, f as DogRepository, g as AnyExpr, h as AllExpr, j as GoalAgentRole, k as DogRun, l as ProgrammaticRunner, m as AcceptancePlan, p as loadSchemaSet, q as JudgmentIdentity, r as DogEngine, s as WorkspaceManager, u as Verdict, v as BoolExpr, w as ContainsEdge, x as CiReport, y as CapturedInput, z as GoalRuntimePhase } from "./core-BiEBMLz3.js";
 import z from "@deepseek-ai/schemastery";
-import { ToolDefinition } from "@deepseek-ai/dsh-tools";
 import { Agent } from "@deepseek-ai/dsh-agent";
+import { ToolDefinition } from "@deepseek-ai/dsh-tools";
 import { Context } from "@deepseek-ai/cordis";
 import { ConnectionRpcHandler } from "@deepseek-ai/dsh-client-connection";
 import { SessionId } from "@deepseek-ai/dsh-session";

package/vendor/dsh-dog/lib/index.js

@@ -1,11 +1,10 @@
-import { a as DogRepository, c as parseGraph, d as parseBoolExpr, i as runPlan, l as isJsonValue, n as resolveScriptPath, o as loadSchemaSet, r as WorkspaceManager, s as DogValidationError, t as DogEngine, u as evaluateBoolExpr } from "./core-DdfMcrB4.js";
+import { a as DogRepository, c as parseGraph, d as parseBoolExpr, i as runPlan, l as isJsonValue, n as resolveScriptPath, o as loadSchemaSet, r as WorkspaceManager, s as DogValidationError, t as DogEngine, u as evaluateBoolExpr } from "./core-BAlgZpLq.js";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
-import { dshHomePath } from "@deepseek-ai/dsh-home-paths";
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve } from "node:path";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { isAbsolute, join } from "node:path";
 import z from "@deepseek-ai/schemastery";
-import { defineTool } from "@deepseek-ai/dsh-tools";
 //#region src/owned-script.ts
 /** Execute without blocking the host event loop; cancellation owns only this process tree. */
 async function runOwnedScript(script, input, signal) {
@@ -79,6 +78,205 @@ async function runOwnedScript(script, input, signal) {
 	}
 }
 //#endregion
+//#region src/host-shims.ts
+/**
+* Self-contained replacements for the two host packages this plugin used to
+* import at runtime: `@deepseek-ai/dsh-home-paths` (`dshHomePath`) and
+* `@deepseek-ai/dsh-tools` (`defineTool`). Both were declared as
+* peerDependencies, and under the DSH profile install layout (pnpm isolated
+* node_modules) peer instances are not resolvable from this vendored
+* directory, so every entry import failed with ERR_MODULE_NOT_FOUND and the
+* plugin never activated (GitHub issue #74). The implementations below match
+* the host behavior for the schema subset this plugin declares; type-only
+* imports from the host packages are still used and erased at build time.
+*/
+/** Directory name for the default DeepSeek Harness home under the OS home. */
+const DSH_HOME_DIR_NAME = ".dsh";
+/** Environment variable that overrides the default DeepSeek Harness home. */
+const DSH_HOME_ENV = "DSH_HOME";
+/** Expand supported tilde prefixes against the operating-system home. */
+function expandHomePath(path) {
+	if (path === "~") return homedir();
+	if (path.startsWith("~/") || path.startsWith("~\\")) return join(homedir(), path.slice(2));
+	return path;
+}
+/**
+* Resolve the single-root DeepSeek Harness home: `$DSH_HOME` when set to a
+* non-blank value, otherwise `~/.dsh`. Mirrors the host `resolveDshHome`.
+*/
+function resolveDshHome() {
+	const fromEnv = process.env[DSH_HOME_ENV];
+	return resolve(expandHomePath(fromEnv !== void 0 && fromEnv.trim().length > 0 ? fromEnv : join(homedir(), DSH_HOME_DIR_NAME)));
+}
+/** Join path segments onto the resolved DeepSeek Harness home. */
+function dshHomePath(...segments) {
+	return join(resolveDshHome(), ...segments);
+}
+/** Thrown when model-generated arguments violate the compiled schema. */
+var ToolArgsError = class extends Error {
+	violations;
+	constructor(violations) {
+		super(`invalid arguments: ${violations.join("; ")}`);
+		this.name = "ToolArgsError";
+		this.violations = violations;
+	}
+};
+/** Compile one author-facing value schema node to raw JSON Schema. */
+function compileValueSchema(spec, path) {
+	if (spec === null || typeof spec !== "object") throw new Error(`${path}: schema node must be an object`);
+	const node = {};
+	if (spec.description !== void 0) node.description = spec.description;
+	switch (spec.type) {
+		case "json": return node;
+		case "string":
+		case "number":
+		case "integer":
+		case "boolean":
+		case "null":
+			node.type = spec.type;
+			if ("enum" in spec && spec.enum !== void 0) node.enum = [...spec.enum];
+			if ("const" in spec && spec.const !== void 0) node.const = spec.const;
+			return node;
+		case "array":
+			node.type = "array";
+			if (spec.items !== void 0) node.items = compileValueSchema(spec.items, `${path}.items`);
+			return node;
+		case "object":
+			node.type = "object";
+			if (spec.additionalProperties !== void 0) node.additionalProperties = spec.additionalProperties;
+			if (spec.properties !== void 0) {
+				const { properties, required } = compilePropertyMap(spec.properties, `${path}.properties`);
+				node.properties = properties;
+				if (required.length > 0) node.required = required;
+			}
+			return node;
+		default: throw new Error(`${path}.type must be string/number/integer/boolean/null/array/object/json`);
+	}
+}
+/** Compile a property map, hoisting per-property `required` flags onto the parent. */
+function compilePropertyMap(input, path) {
+	const properties = {};
+	const required = [];
+	for (const [key, property] of Object.entries(input)) {
+		const { required: isRequired, ...spec } = property;
+		properties[key] = compileValueSchema(spec, `${path}.${key}`);
+		if (isRequired === true) required.push(key);
+	}
+	return {
+		properties,
+		required
+	};
+}
+/** Compile the implicit open parameter object into raw JSON Schema. */
+function compileParameters(spec) {
+	const { properties, required } = compilePropertyMap(spec, "parameters");
+	const schema = {
+		type: "object",
+		properties
+	};
+	if (required.length > 0) schema.required = required;
+	return schema;
+}
+/** Validate one JSON value against the compiled subset, collecting violations. */
+function validateValue(schema, value, path, violations) {
+	const at = path === "" ? "arguments" : path;
+	if (schema.const !== void 0 && value !== schema.const) {
+		violations.push(`${at}: must equal ${JSON.stringify(schema.const)}`);
+		return;
+	}
+	if (Array.isArray(schema.enum) && !schema.enum.some((entry) => entry === value)) {
+		violations.push(`${at}: must be one of ${JSON.stringify(schema.enum)}`);
+		return;
+	}
+	switch (schema.type) {
+		case void 0: return;
+		case "null":
+			if (value !== null) violations.push(`${at}: expected null`);
+			return;
+		case "boolean":
+			if (typeof value !== "boolean") violations.push(`${at}: expected boolean, got ${describe(value)}`);
+			return;
+		case "string":
+			if (typeof value !== "string") violations.push(`${at}: expected string, got ${describe(value)}`);
+			return;
+		case "number":
+			if (typeof value !== "number" || !Number.isFinite(value)) violations.push(`${at}: expected number, got ${describe(value)}`);
+			return;
+		case "integer":
+			if (typeof value !== "number" || !Number.isInteger(value)) violations.push(`${at}: expected integer, got ${describe(value)}`);
+			return;
+		case "array": {
+			if (!Array.isArray(value)) {
+				violations.push(`${at}: expected array, got ${describe(value)}`);
+				return;
+			}
+			const items = schema.items;
+			if (items !== void 0) value.forEach((item, index) => validateValue(items, item, `${at}[${index}]`, violations));
+			return;
+		}
+		case "object": {
+			if (value === null || typeof value !== "object" || Array.isArray(value)) {
+				violations.push(`${at}: expected object, got ${describe(value)}`);
+				return;
+			}
+			const record = value;
+			for (const key of schema.required ?? []) if (!Object.hasOwn(record, key)) violations.push(`${at}: missing required property "${key}"`);
+			const properties = schema.properties;
+			if (properties !== void 0) {
+				for (const [key, propertySchema] of Object.entries(properties)) if (Object.hasOwn(record, key)) validateValue(propertySchema, record[key], `${at}.${key}`, violations);
+			}
+			return;
+		}
+	}
+}
+function describe(value) {
+	if (value === null) return "null";
+	if (Array.isArray(value)) return "array";
+	return typeof value;
+}
+/** Validate model-generated arguments against the compiled parameter schema. */
+function validateArgs(parameters, args) {
+	const violations = [];
+	validateValue(parameters, args, "", violations);
+	return violations;
+}
+/**
+* Define a first-party tool with strict execution validation, matching the
+* host `defineTool` contract: arguments are validated before `execute`, and
+* replay presenters validate softly and fall back to generic rendering.
+*/
+function defineTool(options) {
+	const userExecute = options.execute;
+	const userRender = options.output.render;
+	const userPresentationMeta = options.output.presentationMeta;
+	const userIsConcurrencySafe = options.isConcurrencySafe;
+	if (options.timeoutMs !== void 0 && (!Number.isFinite(options.timeoutMs) || options.timeoutMs <= 0)) throw new Error(`defineTool(${options.name}): timeoutMs must be a positive finite number`);
+	const parameters = compileParameters(options.parameters);
+	const outputSchema = compileValueSchema(options.output.schema, "schema");
+	const validate = (args) => validateArgs(parameters, args);
+	const tool = {
+		name: options.name,
+		description: options.description,
+		parameters,
+		output: {
+			schema: outputSchema,
+			render: (args, value) => userRender(args, value),
+			...userPresentationMeta !== void 0 ? { presentationMeta: (args, value) => userPresentationMeta(args, value) } : {}
+		},
+		...options.timeoutMs !== void 0 ? { timeoutMs: options.timeoutMs } : {},
+		async execute(args, exec) {
+			const violations = validate(args);
+			if (violations.length > 0) throw new ToolArgsError(violations);
+			return userExecute(args, exec);
+		}
+	};
+	if (userIsConcurrencySafe) tool.isConcurrencySafe = (args) => {
+		if (validate(args).length > 0) return false;
+		return userIsConcurrencySafe(args);
+	};
+	return tool;
+}
+//#endregion
 //#region src/debug-contract.ts
 const DOG_DEBUG_RPC_CHANNEL = "/dog-rpc";
 const DOG_DEBUG_SNAPSHOT_ENDPOINT = "snapshot";

package/vendor/dsh-dog/lib/{core-DdfMcrB4.js → core-BAlgZpLq.js}

@@ -1,12 +1,12 @@
 import { fileURLToPath } from "node:url";
-import { appendFile, lstat, mkdir, mkdtemp, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { appendFile, lstat, mkdir, mkdtemp, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { c } from "tar";
 import Ajv2020 from "ajv/dist/2020.js";
 import addFormats from "ajv-formats";
-import { tmpdir } from "node:os";
 //#region src/logic.ts
 /**
 * Parse and type-check the only expression language accepted by DoG.