@toddzheng024/dscode-bundle 0.4.0 → 0.6.0

package/vendor/subagent/index.js

@@ -1,9 +1,12 @@
+// dscode-child-name-v1
+// dscode-child-worktree-v3
 // dscode-child-effort-v1
+import { createChildWorktree, discardCleanChildWorktree } from "../../plugins/worktree-subagent/worktree.mjs";
 import z from "@deepseek-ai/schemastery";
 import { scopeChainOf, scopeOf } from "@deepseek-ai/dsh-scope";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { SessionSeq } from "@deepseek-ai/dsh-session";
-import { assertSubagentMaxDepth, parentAgentOptionsForDelegation, settleRun } from "@deepseek-ai/dsh-subagent";
+import { assertSubagentMaxDepth, parentAgentOptionsForDelegation, settleRun } from "../subagent-core/index.js";
 import { ReasoningEffortId } from "@deepseek-ai/dsh-llm";
 import { z as z$1 } from "zod";
 z.object({
@@ -398,8 +401,13 @@ function apply(ctx, config, session) {
 				subagentProvider,
 				disposeTool: runtimeCtx.tools.register(defineTool({
 					name: toolName,
-					description: wording.description + (backgroundEnabled ? continuable ? " This tool runs in the background by default, immediately returns a durable subagent id, and keeps the child conversation available for later turns. When that run settles, the runtime sends the parent a notice containing its outcome and any final assistant message; `send_message` steers the child's nearest step while it is running and starts a turn while it is idle. Set `run_in_background: false` only when your next action depends on receiving the result." : " This call waits for the result by default. Set `run_in_background: true` to return a job id; collect with `job_output` and stop with `job_kill`." : " This call waits for the subagent and returns its result.") + choiceDescription,
+					description: wording.description + (backgroundEnabled ? continuable ? " This tool runs in the background by default, immediately returns a durable subagent id, and keeps the child conversation available for later turns. When that run settles, the runtime sends the parent a notice containing its outcome and any final assistant message; `send_message` steers the child's nearest step while it is running and starts a turn while it is idle. Set `run_in_background: false` only when your next action depends on receiving the result." : " This call waits for the result by default. Set `run_in_background: true` to return a job id; collect with `job_output` and stop with `job_kill`." : " This call waits for the subagent and returns its result.") + choiceDescription + (continuable && (config.provider === "spawn" || config.provider === "fork") ? " Set worktree: true for an isolated Git checkout when agents edit in parallel. It starts at HEAD and refuses a dirty parent workspace; omit for read-only tasks or when the child needs uncommitted parent edits. You must inspect and integrate its changes; the worktree remains after completion." : ""),
 					parameters: {
+						name: {
+							type: "string",
+							required: true,
+							description: "Unique name you give this child: 1-10 characters, letters, digits and underscores only, starting and ending with a letter (for example read_code). Address the child as /name in send_message and interrupt_agent."
+						},
 						description: {
 							type: "string",
 							required: true,
@@ -428,6 +436,10 @@ function apply(ctx, config, session) {
               type: "string",
               description: "Reasoning effort for this child only, validated against its model. Omit to inherit. Prefer low for bounded tasks, high for difficult work, max for exceptional uncertainty. Provider/model remain unchanged."
             } } : {},
+            ...continuable && (config.provider === "spawn" || config.provider === "fork") ? { worktree: {
+              type: "boolean",
+              description: "Create an isolated Git worktree for this child at clean HEAD. Choose for parallel editing; omit or set false for read-only work or tasks requiring uncommitted parent changes. Parent must integrate the result."
+            } } : {},
             ...backgroundEnabled ? { run_in_background: {
 							type: "boolean",
 							description: continuable ? "Whether to run in the background and return a durable subagent id immediately. Defaults to true. Set false to wait for the result when your next action depends on it." : "Whether to run as a background job and return its id. Defaults to false; collect with job_output or stop with job_kill."
@@ -444,7 +456,8 @@ function apply(ctx, config, session) {
 										required: true,
 										const: "background"
 									},
-									jobId: {
+									worktree: { type: "string" },
+					jobId: {
 										type: "string",
 										required: true
 									}
@@ -459,7 +472,8 @@ function apply(ctx, config, session) {
 										required: true,
 										const: "continuable"
 									},
-									subagentId: {
+									worktree: { type: "string" },
+					subagentId: {
 										type: "string",
 										required: true
 									}
@@ -474,7 +488,8 @@ function apply(ctx, config, session) {
 										required: true,
 										const: "foreground"
 									},
-									runId: {
+									worktree: { type: "string" },
+					runId: {
 										type: "string",
 										required: true
 									},
@@ -488,13 +503,16 @@ function apply(ctx, config, session) {
 						] },
 						render: (_args, value) => [{
 							type: "text",
-							text: value.kind === "background" ? `started background subagent job ${value.jobId}` : value.kind === "continuable" ? `started subagent ${value.subagentId}` : outputValueText(value.output)
+							text: (value.kind === "background" ? `started background subagent job ${value.jobId}` : value.kind === "continuable" ? `started subagent /${_args.name} (${value.subagentId})` : outputValueText(value.output)) + (value.worktree ? `
+Worktree: ${value.worktree}
+Inspect and integrate its changes before removing it.` : "")
 						}]
 					},
 					isConcurrencySafe: () => true,
 					async execute(args, exec) {
 						const parent = exec.agent;
 						if (!parent) throw new Error("subagent tool requires a calling agent (exec.agent was undefined)");
+						if (typeof args.name !== "string" || !/^[A-Za-z](?:[A-Za-z0-9_]{0,8}[A-Za-z])?$/.test(args.name)) throw new Error("name must be 1-10 characters of letters, digits or underscores, starting and ending with a letter");
 						const modelRequest = args;
 						const parentOptions = parentAgentOptionsForDelegation(parent);
 						const requiresRoutePreflight = hasDelegationModelRequest(modelRequest) || hasConfiguredLlmSelection(config.agentOptions);
@@ -510,9 +528,12 @@ function apply(ctx, config, session) {
 							if (runtimeCtx.subagents.getProvider(config.provider) !== subagentProvider) throw new Error(`subagent provider "${config.provider}" changed while resolving the child LLM route; retry the delegation`);
 						}
 						exec.signal.throwIfAborted();
+						if (args.worktree === true && !(continuable && (config.provider === "spawn" || config.provider === "fork"))) throw new Error("worktree is unavailable for this subagent provider");
+						const childWorktree = args.worktree === true ? await createChildWorktree(parent.session.header.cwd, exec.signal) : void 0;
 						const maxDepth = typeof config.maxDepth === "number" ? config.maxDepth : void 0;
 						const request = {
-							label: args.description,
+							label: "/" + args.name + " · " + args.description,
+							...childWorktree ? { workspaceCwd: childWorktree.cwd } : {},
 							prompt: [{
 								type: "text",
 								text: args.prompt
@@ -523,6 +544,7 @@ function apply(ctx, config, session) {
 							...config.toolFilter !== void 0 ? { toolFilter: config.toolFilter } : {},
 							...maxDepth !== void 0 ? { maxDepth } : {}
 						};
+						try {
 						if (resolveDelegationRun(args, {
 							backgroundEnabled,
 							continuable
@@ -531,10 +553,11 @@ function apply(ctx, config, session) {
 								kind: "continuable",
 								subagentId: (await runtimeCtx.subagents.startContinuable({
 									provider: config.provider,
-									label: args.description,
+									label: "/" + args.name + " · " + args.description,
 									request,
 									signal: exec.signal
-								})).childId
+								})).childId,
+									...childWorktree ? { worktree: childWorktree.cwd } : {}
 							};
 							const jobs = runtimeCtx.get("jobs");
 							if (jobs === void 0) throw new Error("background jobs unavailable: load @deepseek-ai/dsh-jobs and @deepseek-ai/dsh-tool-jobs");
@@ -542,7 +565,7 @@ function apply(ctx, config, session) {
 								kind: "background",
 								jobId: jobs.start({
 									kind: "subagent",
-									label: args.description,
+									label: "/" + args.name + " · " + args.description,
 									owner: parent,
 									run: () => {
 										const controller = new AbortController();
@@ -559,10 +582,14 @@ function apply(ctx, config, session) {
 								})
 							};
 						}
-						return settleForegroundRun(await runtimeCtx.subagents.start(config.provider, {
+						return { ...await settleForegroundRun(await runtimeCtx.subagents.start(config.provider, {
 							...request,
 							signal: exec.signal
-						}));
+						})), ...childWorktree ? { worktree: childWorktree.cwd } : {} };
+						} catch (error) {
+							if (childWorktree && !await discardCleanChildWorktree(childWorktree)) throw new Error(`${String(error)}; child worktree retained at ${childWorktree.cwd}`, { cause: error });
+							throw error;
+						}
 					}
 				}))
 			};

package/vendor/subagent-core/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 DeepSeek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.