@neurocode-ai/core 1.18.8

package/src/tool/apply-patch.ts

@@ -0,0 +1,219 @@
+export * as ApplyPatchTool from "./apply-patch"
+
+import { ToolFailure } from "@neurocode-ai/llm"
+import { FileDiff } from "@neurocode-ai/schema/file-diff"
+import { createTwoFilesPatch, diffLines } from "diff"
+import { Effect, Layer, Schema } from "effect"
+import { makeLocationNode } from "../effect/app-node"
+import { FileMutation } from "../file-mutation"
+import { FSUtil } from "../fs-util"
+import { LocationMutation } from "../location-mutation"
+import { Patch } from "../patch"
+import { PermissionV2 } from "../permission"
+import { ToolRegistry } from "./registry"
+import { Tool } from "./tool"
+import { Tools } from "./tools"
+
+export const name = "apply_patch"
+
+export const Input = Schema.Struct({
+  patchText: Schema.String.annotate({
+    description: "The full patch text describing add, update, and delete operations",
+  }),
+})
+
+export const Applied = Schema.Struct({
+  type: Schema.Literals(["add", "update", "delete"]),
+  resource: Schema.String,
+  target: Schema.String,
+})
+
+export const Output = Schema.Struct({
+  applied: Schema.Array(Applied),
+  files: Schema.Array(FileDiff.Info),
+})
+export type Output = typeof Output.Type
+
+export const toModelOutput = (output: Output) =>
+  [
+    "Applied patch sequentially:",
+    ...output.applied.map(
+      (item) => `${item.type === "add" ? "A" : item.type === "delete" ? "D" : "M"} ${item.resource}`,
+    ),
+  ].join("\n")
+
+type Prepared =
+  | (Extract<Patch.Hunk, { readonly type: "add" | "delete" }> & {
+      readonly target: LocationMutation.Target
+      readonly before: string
+      readonly after: string
+    })
+  | (Extract<Patch.Hunk, { readonly type: "update" }> & {
+      readonly target: LocationMutation.Target
+      readonly source: Uint8Array
+      readonly content: string
+      readonly before: string
+      readonly after: string
+    })
+
+const layer = Layer.effectDiscard(
+  Effect.gen(function* () {
+    const tools = yield* Tools.Service
+    const mutation = yield* LocationMutation.Service
+    const files = yield* FileMutation.Service
+    const fs = yield* FSUtil.Service
+    const permission = yield* PermissionV2.Service
+
+    yield* tools
+      .register({
+        [name]: Tool.withPermission(
+          Tool.make({
+            description:
+              "Apply one patch containing add, update, and delete file operations. All targets are resolved and approved before target contents are read. Operations apply sequentially; if a later operation fails, earlier operations remain applied and the failure reports them explicitly. Moves and atomic rollback are not supported yet.",
+            input: Input,
+            output: Output,
+            toModelOutput: ({ output }) => [{ type: "text", text: toModelOutput(output) }],
+            execute: (input, context) => {
+              const applied: Array<typeof Applied.Type> = []
+              const fail = (path: string) => {
+                const prefix =
+                  applied.length === 0
+                    ? `Unable to apply patch at ${path}`
+                    : `Patch partially applied before failing at ${path}. Applied: ${applied.map((item) => item.resource).join(", ")}`
+                return new ToolFailure({ message: prefix })
+              }
+              return Effect.gen(function* () {
+                const source = {
+                  type: "tool" as const,
+                  messageID: context.assistantMessageID,
+                  callID: context.toolCallID,
+                }
+                if (!input.patchText.trim()) return yield* new ToolFailure({ message: "patchText is required" })
+                const hunks = yield* Effect.try({
+                  try: () => Patch.parse(input.patchText),
+                  catch: (cause) => new ToolFailure({ message: `apply_patch verification failed: ${String(cause)}` }),
+                })
+                if (hunks.length === 0) return yield* new ToolFailure({ message: "patch rejected: empty patch" })
+                const move = hunks.find((hunk) => hunk.type === "update" && hunk.movePath !== undefined)
+                if (move) return yield* new ToolFailure({ message: "apply_patch moves are not supported yet" })
+
+                const targets: Array<{ readonly hunk: Patch.Hunk; readonly target: LocationMutation.Target }> = []
+                for (const hunk of hunks)
+                  targets.push({ hunk, target: yield* mutation.resolve({ path: hunk.path, kind: "file" }) })
+                const externalDirectories = new Map<string, LocationMutation.ExternalDirectoryAuthorization>()
+                for (const { target } of targets) {
+                  const external = target.externalDirectory
+                  if (external) externalDirectories.set(external.resource, external)
+                }
+                for (const external of externalDirectories.values()) {
+                  yield* permission.assert({
+                    ...LocationMutation.externalDirectoryPermission(external),
+                    sessionID: context.sessionID,
+                    agent: context.agent,
+                    source,
+                  })
+                }
+                yield* permission.assert({
+                  action: "edit",
+                  resources: [...new Set(targets.map(({ target }) => target.resource))],
+                  save: ["*"],
+                  sessionID: context.sessionID,
+                  agent: context.agent,
+                  source,
+                })
+
+                const prepared: Prepared[] = []
+                for (const { hunk, target } of targets) {
+                  yield* Effect.gen(function* () {
+                    if (hunk.type === "add") {
+                      prepared.push({
+                        ...hunk,
+                        target,
+                        before: "",
+                        after:
+                          hunk.contents.endsWith("\n") || hunk.contents === "" ? hunk.contents : `${hunk.contents}\n`,
+                      })
+                      return
+                    }
+                    if ((yield* fs.stat(target.canonical)).type !== "File") yield* fail(hunk.path)
+                    const source = yield* fs.readFile(target.canonical)
+                    const original = new TextDecoder("utf-8", { ignoreBOM: true }).decode(source)
+                    const before = original.replace(/^\uFEFF/, "")
+                    if (hunk.type === "delete") {
+                      prepared.push({ ...hunk, target, before, after: "" })
+                      return
+                    }
+                    const update = Patch.derive(hunk.path, hunk.chunks, original)
+                    prepared.push({
+                      ...hunk,
+                      target,
+                      source,
+                      content: Patch.joinBom(update.content, update.bom),
+                      before,
+                      after: update.content,
+                    })
+                  }).pipe(Effect.mapError(() => fail(hunk.path)))
+                }
+
+                const patchFiles = prepared.map(patchFile)
+                yield* Effect.forEach(
+                  prepared,
+                  (change) =>
+                    Effect.gen(function* () {
+                      if (change.type === "add") {
+                        const result = yield* files.create({
+                          target: change.target,
+                          content:
+                            change.contents.endsWith("\n") || change.contents === ""
+                              ? change.contents
+                              : `${change.contents}\n`,
+                        })
+                        applied.push({ type: change.type, resource: result.resource, target: result.target })
+                        return
+                      }
+                      if (change.type === "delete") {
+                        const result = yield* files.remove({ target: change.target })
+                        applied.push({ type: change.type, resource: result.resource, target: result.target })
+                        return
+                      }
+                      const result = yield* files.writeIfUnchanged({
+                        target: change.target,
+                        expected: change.source,
+                        content: change.content,
+                      })
+                      applied.push({ type: change.type, resource: result.resource, target: result.target })
+                    }).pipe(Effect.mapError(() => fail(change.path))),
+                  { discard: true },
+                )
+                return { applied, files: patchFiles }
+              }).pipe(Effect.mapError((error) => (error instanceof ToolFailure ? error : fail("patch"))))
+            },
+          }),
+          "edit",
+        ),
+      })
+      .pipe(Effect.orDie)
+  }),
+)
+
+export const node = makeLocationNode({
+  name: "tool/apply-patch",
+  layer,
+  deps: [ToolRegistry.node, LocationMutation.node, FileMutation.node, FSUtil.node, PermissionV2.node],
+})
+
+function patchFile(change: Prepared): typeof FileDiff.Info.Type {
+  const counts = diffLines(change.before, change.after).reduce(
+    (result, item) => ({
+      additions: result.additions + (item.added ? (item.count ?? 0) : 0),
+      deletions: result.deletions + (item.removed ? (item.count ?? 0) : 0),
+    }),
+    { additions: 0, deletions: 0 },
+  )
+  return {
+    file: change.target.resource,
+    patch: createTwoFilesPatch(change.target.resource, change.target.resource, change.before, change.after),
+    status: change.type === "add" ? "added" : change.type === "delete" ? "deleted" : "modified",
+    ...counts,
+  }
+}

package/src/tool/bash.ts

@@ -0,0 +1,207 @@
+export * as BashTool from "./bash"
+
+import path from "path"
+import { ToolFailure } from "@neurocode-ai/llm"
+import { Duration, Effect, Layer, Schema } from "effect"
+import { ChildProcess } from "effect/unstable/process"
+import { Config } from "../config"
+import { makeLocationNode } from "../effect/app-node"
+import { FSUtil } from "../fs-util"
+import { LocationMutation } from "../location-mutation"
+import { AppProcess } from "../process"
+import { PermissionV2 } from "../permission"
+import { PositiveInt } from "../schema"
+import { ToolRegistry } from "./registry"
+import { Tool } from "./tool"
+import { Tools } from "./tools"
+
+export const name = "bash"
+export const DEFAULT_TIMEOUT_MS = 2 * 60 * 1_000
+export const MAX_TIMEOUT_MS = 10 * 60 * 1_000
+export const MAX_CAPTURE_BYTES = 1024 * 1024
+
+export const Input = Schema.Struct({
+  command: Schema.String.annotate({ description: "Shell command string to execute" }),
+  workdir: Schema.String.pipe(Schema.optional).annotate({
+    description: "Working directory. Defaults to the active Location; relative paths resolve from that Location.",
+  }),
+  timeout: PositiveInt.check(Schema.isLessThanOrEqualTo(MAX_TIMEOUT_MS))
+    .pipe(Schema.optional)
+    .annotate({
+      description: `Timeout in milliseconds. Defaults to ${DEFAULT_TIMEOUT_MS} and may not exceed ${MAX_TIMEOUT_MS}.`,
+    }),
+})
+
+const StructuredOutput = Schema.Struct({
+  exit: Schema.Number.pipe(Schema.optional),
+  truncated: Schema.Boolean,
+  timeout: Schema.Boolean.pipe(Schema.optional),
+})
+
+const Output = Schema.Struct({
+  ...StructuredOutput.fields,
+  output: Schema.String,
+  warnings: Schema.Array(Schema.String).pipe(Schema.optional),
+})
+
+type Output = typeof Output.Type
+
+const defaultShell = () => (process.platform === "win32" ? (process.env.COMSPEC ?? "cmd.exe") : "/bin/sh")
+
+const modelOutput = (output: Output) => {
+  const warnings = output.warnings?.length
+    ? `\n\nWarnings:\n${output.warnings.map((warning) => `- ${warning}`).join("\n")}`
+    : ""
+  if (output.timeout) return `${warnings.trimStart()}${warnings ? "\n\n" : ""}Command timed out before completion.`
+  return `${warnings.trimStart()}${warnings ? "\n\n" : ""}Command exited with code ${output.exit}.`
+}
+
+const isTimeout = (error: AppProcess.AppProcessError) =>
+  error.cause instanceof Error && error.cause.message === "Timed out"
+
+/**
+ * Minimal V2 core shell boundary. Keep parity debt visible without pulling the
+ * legacy shell runtime into core.
+ */
+// TODO: Port tree-sitter bash / PowerShell parser-based approval reduction.
+// TODO: Port BashArity reusable command-prefix approvals.
+// TODO: Replace token-based command-argument external-directory advisories with parser-based detection.
+// TODO: Restore PowerShell and cmd-specific invocation/path handling on Windows.
+// TODO: Add plugin shell.env environment augmentation once V2 plugin hooks exist.
+// TODO: Add durable/live progress metadata streaming for long-running commands once V2 tool invocation progress context is wired.
+// TODO: Persist background job status and define restart recovery before exposing remote observation.
+// TODO: Re-add model-facing background launch only with owner-bound get/wait/cancel tools and completion delivery.
+// TODO: Add HTTP background-job observation only after durable status, restart recovery, and authorization are defined.
+// TODO: Revisit process-group cleanup and platform coverage with shell-specific tests if current AppProcess semantics do not fully cover it.
+// TODO: Revisit binary output handling if stdout/stderr decoding is text-only.
+// TODO: Stream full shell output into managed storage while retaining only a bounded in-memory preview.
+
+const shellTokens = (command: string) => command.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g) ?? []
+const unquote = (value: string) => value.replace(/^(['"])(.*)\1$/, "$2")
+const externalCommandDirectories = Effect.fn("BashTool.externalCommandDirectories")(function* (
+  fs: FSUtil.Interface,
+  command: string,
+  cwd: string,
+) {
+  const directories = new Set<string>()
+  for (const token of shellTokens(command)) {
+    const value = unquote(token).replace(/[;,|&]+$/, "")
+    if (!path.isAbsolute(value)) continue
+    const resolved = yield* fs.resolve(value)
+    if (FSUtil.contains(cwd, resolved)) continue
+    directories.add(yield* fs.resolve(path.dirname(resolved)))
+  }
+  return [...directories]
+})
+
+const layer = Layer.effectDiscard(
+  Effect.gen(function* () {
+    const tools = yield* Tools.Service
+    const mutation = yield* LocationMutation.Service
+    const fs = yield* FSUtil.Service
+    const appProcess = yield* AppProcess.Service
+    const config = yield* Config.Service
+    const permission = yield* PermissionV2.Service
+
+    yield* tools
+      .register({
+        [name]: Tool.make({
+          description: `Execute one shell command string with the host user's filesystem, process, and network authority. The active Location is the default working directory. Relative workdir values resolve from that Location. External workdir values require external_directory approval; best-effort command-argument path warnings are advisory only. Timeout values are milliseconds (default: ${DEFAULT_TIMEOUT_MS}; maximum: ${MAX_TIMEOUT_MS}). Uses the configured shell when set; otherwise uses /bin/sh on POSIX and COMSPEC or cmd.exe on Windows.`,
+          input: Input,
+          output: Output,
+          structured: StructuredOutput,
+          toStructuredOutput: ({ output }) => ({
+            truncated: output.truncated,
+            ...(output.exit === undefined ? {} : { exit: output.exit }),
+            ...(output.timeout === undefined ? {} : { timeout: output.timeout }),
+          }),
+          toModelOutput: ({ output }) => [
+            { type: "text", text: output.output },
+            { type: "text", text: modelOutput(output) },
+          ],
+          execute: (input, context) =>
+            Effect.gen(function* () {
+              const source = {
+                type: "tool" as const,
+                messageID: context.assistantMessageID,
+                callID: context.toolCallID,
+              }
+              const target = yield* mutation.resolve({ path: input.workdir ?? ".", kind: "directory" })
+              const external = target.externalDirectory
+              if (external)
+                yield* permission.assert({
+                  ...LocationMutation.externalDirectoryPermission(external),
+                  sessionID: context.sessionID,
+                  agent: context.agent,
+                  source,
+                })
+              const warnings = (yield* externalCommandDirectories(fs, input.command, target.canonical)).map(
+                (directory) =>
+                  `Command argument references external directory ${path.join(directory, "*").replaceAll("\\", "/")}. Bash runs with host-user filesystem, process, and network authority; this scan is advisory only.`,
+              )
+              yield* permission.assert({
+                action: name,
+                resources: [input.command],
+                save: [input.command],
+                sessionID: context.sessionID,
+                agent: context.agent,
+                source,
+              })
+
+              if ((yield* fs.stat(target.canonical)).type !== "Directory")
+                return yield* Effect.fail(new Error(`Working directory is not a directory: ${target.canonical}`))
+
+              const entries = yield* config.entries()
+              const shell =
+                Object.assign({}, ...entries.flatMap((entry) => (entry.type === "document" ? [entry.info] : [])))
+                  .shell ?? defaultShell()
+              const command = ChildProcess.make(input.command, [], {
+                cwd: target.canonical,
+                shell,
+                stdin: "ignore",
+                detached: process.platform !== "win32",
+                forceKillAfter: Duration.seconds(3),
+              })
+              const timeout = input.timeout ?? DEFAULT_TIMEOUT_MS
+              const result = yield* appProcess
+                .run(command, {
+                  combineOutput: true,
+                  timeout: Duration.millis(timeout),
+                  maxOutputBytes: MAX_CAPTURE_BYTES,
+                })
+                .pipe(
+                  Effect.catchTag("AppProcessError", (error) =>
+                    isTimeout(error) ? Effect.succeed(undefined) : Effect.fail(error),
+                  ),
+                )
+              if (!result) {
+                return {
+                  output: `Command exceeded timeout of ${timeout} ms. Retry with a larger timeout if the command is expected to take longer.`,
+                  truncated: false,
+                  timeout: true,
+                  ...(warnings.length ? { warnings } : {}),
+                }
+              }
+
+              const output = result.output?.toString("utf8") || "(no output)"
+              const notice = result.outputTruncated
+                ? "[output capture truncated at the in-memory safety limit]"
+                : undefined
+              return {
+                exit: result.exitCode,
+                output: notice ? `${output}\n\n${notice}` : output,
+                truncated: result.outputTruncated === true,
+                ...(warnings.length ? { warnings } : {}),
+              }
+            }).pipe(Effect.mapError(() => new ToolFailure({ message: `Unable to execute command: ${input.command}` }))),
+        }),
+      })
+      .pipe(Effect.orDie)
+  }),
+)
+
+export const node = makeLocationNode({
+  name: "tool/bash",
+  layer,
+  deps: [ToolRegistry.node, LocationMutation.node, FSUtil.node, AppProcess.node, Config.node, PermissionV2.node],
+})

package/src/tool/builtins.ts

@@ -0,0 +1,48 @@
+export * as BuiltInTools from "./builtins"
+
+import { makeLocationNode } from "../effect/app-node"
+import { Layer } from "effect"
+import { BashTool } from "./bash"
+import { ApplyPatchTool } from "./apply-patch"
+import { EditTool } from "./edit"
+import { GlobTool } from "./glob"
+import { GrepTool } from "./grep"
+import { QuestionTool } from "./question"
+import { ReadTool } from "./read"
+import { SkillTool } from "./skill"
+import { TodoWriteTool } from "./todowrite"
+import { WebFetchTool } from "./webfetch"
+import { WebSearchTool } from "./websearch"
+import { WriteTool } from "./write"
+
+/**
+ * Composes only the shipped Location-scoped built-in tool transforms.
+ * Each tool retains its implementation and focused tests independently. Dynamic
+ * MCP and plugin tools later use separate scoped canonical registrations, while
+ * provider/model filtering belongs to a future materialization phase rather
+ * than this static list. The caller intentionally supplies shared Location
+ * services once to this merged set.
+ *
+ * TODO: Port the remaining launch-follow-up leaves deliberately: edit fuzzy
+ * parity, task, LSP,
+ * repo_clone, repo_overview, plan_exit, and Rune/code mode. Keep MCP and plugin
+ * transforms separate from this static built-in list.
+ */
+export const node = makeLocationNode({
+  name: "built-in-tools",
+  layer: Layer.empty,
+  deps: [
+    ApplyPatchTool.node,
+    BashTool.node,
+    EditTool.node,
+    GlobTool.node,
+    GrepTool.node,
+    QuestionTool.node,
+    ReadTool.node,
+    SkillTool.node,
+    TodoWriteTool.node,
+    WebFetchTool.node,
+    WebSearchTool.node,
+    WriteTool.node,
+  ],
+})