@hy-sde-org/dsh-internal-urls 0.1.1-rc.2

package/LICENSE

@@ -0,0 +1,37 @@
+MIT License
+
+Copyright (c) 2026 hy-sde
+
+This repository ports the FS-shaped internal-URL system (conflict://, issue://,
+pr:// — one resolver registry behind read/grep/write) from oh-my-pi's
+coding-agent internal-urls and conflict-detect modules, adapted to the
+DeepSeek Harness file-services seam. Ported portions are distributed under the
+same MIT license with their original copyright held by their respective
+authors:
+
+  Copyright (c) 2025 Mario Zechner
+  Copyright (c) 2025-2026 Can Bölük
+
+See THIRD-PARTY-NOTICES.md for full provenance per module.
+
+Parts of this repository are derived from DeepSeek Harness
+(https://github.com/deepseek-ai/deepseek-harness), 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.

package/README.md

@@ -0,0 +1,101 @@
+# @hy-sde-org/dsh-internal-urls
+
+FS-shaped **internal URL schemes** for DeepSeek Harness: `conflict://`,
+`issue://`, and `pr://` resolved through one resolver registry
+(`ctx.internalUrls`) that the read/grep/write tools consult before touching
+the filesystem. Ported from the [@oh-my-pi](https://github.com/oh-my-pi)
+coding-agent `internal-urls` system (see `port_omp.md` — the port lives in
+the [hy-sde fork](https://github.com/hy-sde/deepseek-harness)) and shipped as
+a **standalone plugin**: the registry row installs via `cordis.patch.yml`, and
+the routing tools install as agent-scope shadows
+(`@hy-sde-org/dsh-tool-fs-internal-urls` /
+`@hy-sde-org/dsh-tool-fs-search-internal-urls`). Nothing in the upstream
+DeepSeek Harness (`dsh-v0.1.1-rc.2` and later) needs to change.
+
+## URL shapes
+
+- `conflict://<N>` — a recorded git conflict block (register one by reading
+  the conflicted file; `read` appends a resolution notice with the ids).
+  `conflict://<N>/ours|theirs|base` renders one side; `conflict://*` summarizes
+  every registered block. `write({ path: "conflict://<N>", content })` splices
+  the resolution into the backing file (`@ours` / `@theirs` / `@base` /
+  `@both` line tokens expand; `conflict://*` bulk-resolves). `<path>:conflicts`
+  reads a whole-file conflict summary.
+- `issue://` / `pr://` — GitHub-as-filesystem through the `gh` CLI:
+  `issue://owner/repo`, `issue://123`, `issue://owner/repo/123`,
+  `pr://N/diff`, `pr://N/diff/all`, `pr://N/diff/<i>`, list options
+  (`?state=open&limit=30`, `?comments=0`).
+
+## Install
+
+```bash
+pnpm install --global @deepseek-ai/dsh
+```
+
+### Direct from npm (published)
+
+All three packages are published on the npm registry under the `hy-sde-org`
+organization (version `0.1.1-rc.2`). Add the service, then mount the routing
+tools via a preset:
+
+```bash
+dsh plugin --profile web add @hy-sde-org/dsh-internal-urls \
+  @hy-sde-org/dsh-tool-fs-internal-urls \
+  @hy-sde-org/dsh-tool-fs-search-internal-urls
+```
+
+Then copy `examples/agent-preset/` from the installed package (or this repo)
+to `~/.dsh/.agent-presets/<id>/` and select it in the Web UI preset picker.
+
+### From the git checkout (pre-publish / development)
+
+```bash
+git clone git@github.com:hy-sde/dsh-internal-urls.git
+cd dsh-internal-urls
+pnpm install
+pnpm run build
+
+IU_TGZ="$(cd packages/internal-urls && pnpm pack --silent --pack-destination /tmp)"
+FS_TGZ="$(cd packages/tool-fs-internal-urls && pnpm pack --silent --pack-destination /tmp)"
+SEARCH_TGZ="$(cd packages/tool-fs-search-internal-urls && pnpm pack --silent --pack-destination /tmp)"
+dsh plugin --profile web add "$IU_TGZ" "$FS_TGZ" "$SEARCH_TGZ"
+```
+
+## How stock-harness routing works
+
+The official harness ships `dsh-tool-fs` (`read`/`write`/`edit`) and
+`dsh-tool-fs-search` (`grep`) host-wide, with no seam into `ctx.internalUrls`
+(that routing only exists in the hy-sde fork). This plugin therefore mounts
+agent-scope **shadow** copies of those two tool suites that behave identically
+on plain filesystem paths and route internal URLs through the registry when
+mounted — harness scoped-tools semantics let the agent's own registration
+shadow the global one, so only sessions using the preset preset get the
+routing, and stock tool behavior elsewhere is untouched.
+
+## Service API
+
+```ts ignore-check
+await ctx.plugin(InternalUrls)
+
+const iu = ctx.internalUrls                  // InternalUrlsService
+iu.register(handler)                         // one ProtocolHandler per scheme
+await iu.resolve('conflict://1', { sessionKey, cwd, signal })
+await iu.write('conflict://1', '@theirs', { sessionKey, cwd, signal, sandboxPolicy })
+iu.conflicts(sessionKey)                     // per-session ConflictHistory
+```
+
+Handlers are plain objects (`{ scheme, immutable, resolve, write?, complete? }`)
+registered per scheme; the shipped `conflict://`, `issue://`, `pr://`
+handlers mount with the plugin and are removed on unmount.
+
+## Config (the `internal-urls` row)
+
+No configuration today — the row is inserted bare. Handler state (conflict
+histories) is keyed by session inside the service; the optional
+`SandboxExecutionPolicy` rides the write context opaque from the routing tool.
+
+## Tests
+
+```sh
+pnpm -r --filter @hy-sde-org/dsh-internal-urls test
+```

package/cordis.patch.yml

@@ -0,0 +1,25 @@
+# @hy-sde-org/dsh-internal-urls — install surface for FS-shaped internal URLs.
+#
+# The `ctx.internalUrls` SERVICE is host-plane: the resolver registry (and the
+# per-session conflict histories it keys) crosses sessions, so this bundle
+# inserts one row into the profile. The read/write/grep ROUTING that consumes
+# it cannot live on the host plane on stock DeepSeek Harness: the official
+# `dsh-tool-fs` always registers `read`/`write`/`edit` (and `dsh-tool-fs-search`
+# registers `grep`), so a second owner anywhere in the host tree fails boot
+# with "prompt section `tool:read` is already registered". The routing
+# therefore ships in agent-scope shadow tools — `@hy-sde-org/dsh-tool-fs-internal-urls`
+# and `@hy-sde-org/dsh-tool-fs-search-internal-urls` — mounted from a user
+# agent preset (see examples/agent-preset/), where scoped shadowing makes
+# them THE `read`/`write`/`grep` for that session while the deployment's
+# stock tools keep serving every other scope untouched.
+#
+# `insert` is the stock harness patch form for rows that don't exist in the
+# deployment's composition (a plain `id:`+`name:` entry is a modification of
+# an existing row). This patch INSERTS a new row only — it touches no existing
+# row, so `dsh plugin add @hy-sde-org/dsh-internal-urls` never breaks boot on
+# a stock DeepSeek Harness (0.1.1-rc.2 and later). Without the preset rows the
+# registry exists but no tool consults it.
+
+- insert:
+    - id: internal-urls
+      name: '@hy-sde-org/dsh-internal-urls'

package/dist/conflict.d.ts

@@ -0,0 +1,161 @@
+/**
+ * Detecting, surfacing, and resolving git merge conflicts through FS-shaped
+ * URLs — the `conflict://` protocol. The read tool registers the conflict
+ * blocks it surfaces with a per-session history; the agent then resolves one
+ * with `write({ path: "conflict://<N>", content })`, or bulk-resolves every
+ * registered block with `write({ path: "conflict://*", content })`.
+ *
+ * Marker shape is strict: only column-0 markers of the exact prefix length
+ * followed by either EOL or a single space + label count. Lines that merely
+ * start with `<` or `=` never match.
+ *
+ * Ported from oh-my-pi (`packages/coding-agent/src/tools/conflict-detect.ts`),
+ * MIT, adapted to the DeepSeek Harness file-services seam.
+ * @module @hy-sde-org/dsh-internal-urls/conflict
+ */
+import type { InternalResource, ParsedInternalUrl, ProtocolHandler, ResolveContext, WriteContext } from './types.ts';
+/** One completed conflict block with its marker line numbers and side bodies. */
+export interface ConflictBlock {
+    /** 1-indexed line of the `<<<<<<<` marker. */
+    startLine: number;
+    /** 1-indexed line of the `=======` separator. */
+    separatorLine: number;
+    /** 1-indexed line of the `>>>>>>>` marker. */
+    endLine: number;
+    /** 1-indexed line of the `|||||||` base marker (diff3 only). */
+    baseLine?: number;
+    oursLabel?: string;
+    baseLabel?: string;
+    theirsLabel?: string;
+    oursLines: string[];
+    baseLines?: string[];
+    theirsLines: string[];
+}
+/**
+ * Scan already-collected file lines for completed conflict blocks.
+ * `firstLineNumber` is the 1-indexed line number of `lines[0]` (so a windowed
+ * read starting at line 200 passes `firstLineNumber: 200`). Only fully-closed
+ * blocks are returned.
+ */
+export declare function scanConflictLines(lines: readonly string[], firstLineNumber: number): ConflictBlock[];
+/**
+ * Scan whole-file content (already decoded text) for conflict blocks. Returns
+ * only complete blocks; an unclosed opener at EOF yields none.
+ */
+export declare function scanConflictsInContent(content: string): ConflictBlock[];
+/** Recorded conflict block keyed by a session-stable id. */
+export interface ConflictEntry extends ConflictBlock {
+    id: number;
+    absolutePath: string;
+    displayPath: string;
+}
+/**
+ * Per-session log of conflict regions surfaced by `read`/`:conflicts`. The
+ * history is append-only by content identity: re-reading a still-present block
+ * reuses its id, so retries never depend on re-reading even after other blocks
+ * in the file resolve.
+ */
+export declare class ConflictHistory {
+    #private;
+    private nextId;
+    register(input: Omit<ConflictEntry, 'id'>): ConflictEntry;
+    get(id: number): ConflictEntry | undefined;
+    /** Every registered entry in id (insertion) order. */
+    entries(): ConflictEntry[];
+    /** Drop a single entry by id; used after a successful resolve. */
+    invalidate(id: number): void;
+    /** Drop every entry referencing `absolutePath`. */
+    invalidatePath(absolutePath: string): void;
+}
+/** A side of a conflict block addressable as `conflict://N/<scope>`. */
+export type ConflictScope = 'ours' | 'theirs' | 'base';
+/** Parsed `conflict://<N>` / `conflict://<N>/<scope>` / `conflict://*` URI. */
+export interface ParsedConflictUri {
+    /** `"*"` selects every currently-registered conflict (bulk write only). */
+    id: number | '*';
+    scope?: ConflictScope;
+}
+/**
+ * Parse a `conflict://<N>`, `conflict://<N>/<scope>`, or `conflict://*` URI.
+ * Returns `null` for non-conflict paths; throws for a well-formed scheme with
+ * an invalid id or scope so the agent gets a clear message.
+ */
+export declare function parseConflictUri(raw: string): ParsedConflictUri | null;
+/** A side of a conflict block that read can render via `conflict://N/<scope>`. */
+export declare function renderConflictRegion(entry: ConflictEntry, scope: ConflictScope | undefined): {
+    lines: string[];
+    startLine: number;
+};
+/**
+ * Expand `@ours` / `@theirs` / `@base` / `@both` line tokens against the
+ * recorded sections of `entry`. A token only triggers when it is the entire
+ * content of a line; other lines pass through verbatim. `@base` throws when
+ * the conflict was 2-way (no base recorded).
+ */
+export declare function expandContentTokens(content: string, entry: ConflictEntry): string;
+/**
+ * Splice the conflict region recorded in `entry` out of `originalText` and
+ * replace it with `replacement`, markers and all sides included. Locates the
+ * recorded marker block by content anchored to the recorded start line, so
+ * out-of-band edits earlier in the file that shift line numbers don't break
+ * resolution. Replacement lines that exactly echo the adjacent context are
+ * dropped (the universal "whole function" paste artifact). Returns the new
+ * text and how many echo lines were trimmed at each boundary.
+ */
+export declare function spliceConflict(originalText: string, entry: ConflictEntry, replacement: string): {
+    text: string;
+    trimmedLeading: number;
+    trimmedTrailing: number;
+};
+/**
+ * Build a compact diff-style footer describing the conflicts registered during
+ * a read. Appended to the read output so the agent learns the `conflict://<N>`
+ * ids and the resolution protocol.
+ */
+export declare function formatConflictWarning(entries: readonly ConflictEntry[]): string;
+/**
+ * Render a one-line-per-block index of every registered conflict. Used by the
+ * `<path>:conflicts` read selector to give the agent a cheap overview of a
+ * heavily-conflicted file without dumping every body.
+ */
+export declare function formatConflictSummary(entries: readonly ConflictEntry[], displayPath: string): string;
+/**
+ * File access the conflict handler performs resolution through — provided by
+ * the service plugin against `ctx.fs` so splice/rewrite keep every seam
+ * guarantee (target identity, atomic publish, sandbox policy).
+ */
+export interface ConflictFileBridge {
+    /** Read the whole current file text at `absolutePath`. */
+    readFile(absolutePath: string, signal?: AbortSignal): Promise<string>;
+    /** Replace `absolutePath` with `content` (unconditional atomic write). */
+    writeFile(absolutePath: string, content: string, signal?: AbortSignal, sandboxPolicy?: unknown): Promise<void>;
+}
+/**
+ * The `conflict://` protocol handler.
+ *
+ * Reads:
+ * - `conflict://<N>` — full recorded marker block, lines prefixed by file line numbers.
+ * - `conflict://<N>/ours|theirs|base` — one side only.
+ * - `conflict://*` — summary of every currently-registered block.
+ *
+ * Writes:
+ * - `conflict://<N>` — splice the recorded region, replace with `content`
+ *   (`@ours`/`@theirs`/`@base`/`@both` line tokens expand).
+ * - `conflict://*` — bulk: either one `content` for every registered block,
+ *   or per-id lines `"N: @side"` resolving each listed id.
+ */
+export declare class ConflictProtocolHandler implements ProtocolHandler {
+    private readonly deps;
+    readonly scheme = "conflict";
+    readonly immutable = false;
+    constructor(deps: {
+        historyFor: (sessionKey: string | undefined) => ConflictHistory;
+        bridge: ConflictFileBridge;
+    });
+    resolve(url: ParsedInternalUrl, context?: ResolveContext): Promise<InternalResource>;
+    write(url: ParsedInternalUrl, content: string, context?: WriteContext): Promise<void>;
+    /** Apply the same (token-expanded) content to every registered block. */
+    private writeBulk;
+    private resolveEntry;
+}
+//# sourceMappingURL=conflict.d.ts.map

package/dist/conflict.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict.d.ts","sourceRoot":"","sources":["../src/conflict.ts"],"names":[],"mappings":"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"}