ns-omp-provider 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.3.1
+
+Bundles `@ngosangns/ns-pi-provider@0.2.2`.
+
+- fix(grok): Grok's own tool activity is now visible in OMP. The Grok agent edits
+  files and runs commands inside its own ACP process; those tools were dropped, so
+  turns looked like read-only reasoning even when files changed. Each tool now shows
+  as a line in the reply (`` - Edit `src/a.ts` (+3 −1) ``, `` - Run `npm test` ``,
+  `✗ … failed`). Text only — OMP never re-runs them. `PI_GROK_SDK_SHOW_TOOLS=0` hides.
+- fix(grok): cold-start prompts carry a short bridge note so Grok acts with its
+  built-in tools instead of describing OMP tool calls (`PI_GROK_SDK_BRIDGE_NOTE=0`
+  disables).
+
 ## 0.3.0
 
 - **Breaking: `kiro` is now opt-in.** By default only `devin` and `grok` (+ `grok-sdk`)

package/README.md

@@ -88,7 +88,7 @@ register the same `kiro` provider id.
   (since ns-pi-provider 0.2.0): with no Kiro credential and no saved catalog
   snapshot, `kiro` registers zero models, and `-1m` long-context variants are
   not offered.
-- **Upstream pin** — this release bundles `@ngosangns/ns-pi-provider@0.2.1`.
+- **Upstream pin** — this release bundles `@ngosangns/ns-pi-provider@0.2.2`.
   Bumping it is a deliberate change (rebuild + retest).
 
 ## Development

package/dist/index.js

@@ -1,4 +1,4 @@
-// ns-omp-provider 0.3.0 — bundles @ngosangns/ns-pi-provider@0.2.1 (MIT). See NOTICE.
+// ns-omp-provider 0.3.1 — bundles @ngosangns/ns-pi-provider@0.2.2 (MIT). See NOTICE.
 import { createRequire as __nsOmpCreateRequire } from 'node:module';
 const require = __nsOmpCreateRequire(import.meta.url);
 var __defProp = Object.defineProperty;
@@ -3798,9 +3798,14 @@ function mapReasoningEffort(reasoning) {
   }
   return void 0;
 }
-function envFlag(name, env = process.env) {
-  const v = env[name];
-  return v === "1" || v === "true" || v === "yes";
+function envFlagDefault(names, fallback, env = process.env) {
+  for (const name of names) {
+    const raw = env[name]?.trim().toLowerCase();
+    if (!raw) continue;
+    if (raw === "1" || raw === "true" || raw === "yes" || raw === "on") return true;
+    if (raw === "0" || raw === "false" || raw === "no" || raw === "off") return false;
+  }
+  return fallback;
 }
 
 // node_modules/@ngosangns/ns-pi-provider/src/grok/models.ts
@@ -3985,6 +3990,8 @@ var PiContentEmitter = class {
   started = false;
   thinkingContentIndex = -1;
   textContentIndex = -1;
+  /** Last visible text appended was a tool-activity list line. */
+  lastTextWasTool = false;
   mutuallyExclusive;
   /** Current immutable view (for external reads). */
   snapshot() {
@@ -4025,6 +4032,7 @@ var PiContentEmitter = class {
     const contentIndex = this.textContentIndex;
     const block = this.partial.content[contentIndex];
     this.textContentIndex = -1;
+    this.lastTextWasTool = false;
     if (block?.type !== "text") return "";
     this.push({
       type: "text_end",
@@ -4063,6 +4071,32 @@ var PiContentEmitter = class {
   }
   appendText(delta, options) {
     if (!delta) return;
+    if (this.lastTextWasTool && this.textContentIndex >= 0) {
+      this.lastTextWasTool = false;
+      const open = this.partial.content[this.textContentIndex];
+      if (open?.type === "text" && !open.text.endsWith("\n\n")) {
+        delta = `${open.text.endsWith("\n") ? "\n" : "\n\n"}${delta}`;
+      }
+    }
+    this.lastTextWasTool = false;
+    this.appendTextRaw(delta, options);
+  }
+  /**
+   * Visible tool-activity line(s) ("- Edit `a.ts` (+1 −1)\n") in the answer
+   * text, separated from surrounding prose so Markdown renders them as a list.
+   */
+  appendToolActivity(lines, options) {
+    if (!lines) return;
+    let delta = lines.endsWith("\n") ? lines : `${lines}
+`;
+    const open = this.textContentIndex >= 0 ? this.partial.content[this.textContentIndex] : void 0;
+    if (!this.lastTextWasTool && open?.type === "text" && open.text && !open.text.endsWith("\n\n")) {
+      delta = `${open.text.endsWith("\n") ? "\n" : "\n\n"}${delta}`;
+    }
+    this.appendTextRaw(delta, options);
+    this.lastTextWasTool = true;
+  }
+  appendTextRaw(delta, options) {
     this.ensureStart();
     if (options?.closeThinking ?? this.mutuallyExclusive) this.closeThinking();
     if (this.textContentIndex < 0) {
@@ -4187,6 +4221,15 @@ var StreamingUpdatePump = class {
 
 // node_modules/@ngosangns/ns-pi-provider/src/grok/prompt.ts
 init_pi_ai();
+var GROK_BRIDGE_NOTE = [
+  "[grok bridge] You are the Grok coding agent, running behind an external coding harness that only relays your messages.",
+  "Tools named in the harness instructions below (read, bash, edit, write, \u2026) are not callable from here.",
+  "Use your own built-in tools (read_file, grep, search_replace, write, run_terminal_command, \u2026) directly in the working directory.",
+  "When the task needs file changes or commands, perform them with those tools instead of describing them or writing tool calls as text."
+].join("\n");
+function bridgeNoteEnabled() {
+  return envFlagDefault(["PI_GROK_SDK_BRIDGE_NOTE"], true);
+}
 function contentToText(content) {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
@@ -4223,6 +4266,7 @@ ${contentToText(message2.content)}`);
 ${contentToText(message2.content)}`);
     }
   }
+  if (parts.length > 0 && bridgeNoteEnabled()) parts.unshift(GROK_BRIDGE_NOTE);
   return parts.join("\n\n");
 }
 function buildIncrementalPrompt(context) {
@@ -4669,6 +4713,140 @@ async function withSessionAgent(params, fn) {
   });
 }
 
+// node_modules/@ngosangns/ns-pi-provider/src/grok/tool-activity.ts
+var MAX_LABEL = 160;
+function toolMeta(update) {
+  const meta = update._meta?.["x.ai/tool"];
+  if (!meta || typeof meta !== "object") return {};
+  const m = meta;
+  return {
+    name: typeof m.name === "string" ? m.name : void 0,
+    kind: typeof m.kind === "string" ? m.kind : void 0,
+    label: typeof m.label === "string" ? m.label : void 0
+  };
+}
+function oneLine(text2, max = MAX_LABEL) {
+  const flat = text2.replace(/\s*\n\s*/g, " \u23CE ").replace(/\s+/g, " ").trim();
+  return flat.length > max ? `${flat.slice(0, max - 1)}\u2026` : flat;
+}
+function countLines(text2) {
+  if (typeof text2 !== "string" || text2.length === 0) return 0;
+  const body = text2.endsWith("\n") ? text2.slice(0, -1) : text2;
+  return body.split("\n").length;
+}
+function diffStat(content) {
+  if (!Array.isArray(content)) return "";
+  let added = 0;
+  let removed = 0;
+  let seen = false;
+  for (const item of content) {
+    if (!item || typeof item !== "object") continue;
+    const c = item;
+    if (c.type !== "diff") continue;
+    seen = true;
+    added += countLines(c.newText);
+    removed += countLines(c.oldText);
+  }
+  return seen ? `+${added} \u2212${removed}` : "";
+}
+function firstText(content) {
+  if (!Array.isArray(content)) return "";
+  for (const item of content) {
+    if (!item || typeof item !== "object") continue;
+    const c = item;
+    const inner = c.content;
+    if (c.type === "content" && inner && typeof inner.text === "string" && inner.text.trim()) {
+      return inner.text;
+    }
+  }
+  return "";
+}
+var ToolActivityTracker = class {
+  constructor(cwd) {
+    this.cwd = cwd;
+  }
+  cwd;
+  tools = /* @__PURE__ */ new Map();
+  relativize(text2) {
+    const cwd = this.cwd?.replace(/\/+$/, "");
+    if (!cwd || cwd === "/") return text2;
+    let out = text2;
+    const roots = /* @__PURE__ */ new Set([cwd, cwd.replace(/^\/private\//, "/")]);
+    for (const root of [...roots]) roots.add(`/private${root}`);
+    for (const root of [...roots].sort((a, b) => b.length - a.length)) {
+      out = out.split(`${root}/`).join("");
+      out = out.split(`\`${root}\``).join("`.`");
+    }
+    return out;
+  }
+  describe(entry) {
+    const input = entry.rawInput ?? {};
+    let label;
+    if (entry.kind === "execute" && typeof input.command === "string") {
+      label = `Run \`${oneLine(String(input.command), MAX_LABEL - 8)}\``;
+    } else if (entry.title && entry.title !== entry.name) {
+      label = oneLine(entry.title);
+    } else {
+      const verb = entry.label ?? entry.name ?? "Tool";
+      const target = typeof input.file_path === "string" && input.file_path || typeof input.target_file === "string" && input.target_file || typeof input.path === "string" && input.path || typeof input.pattern === "string" && input.pattern || typeof input.query === "string" && input.query || "";
+      label = target ? `${verb} \`${oneLine(String(target), MAX_LABEL - 8)}\`` : verb;
+    }
+    return this.relativize(label);
+  }
+  /**
+   * Feed one ACP `session/update`. Returns Markdown line(s) to show (each
+   * ending in "\n"), or undefined when nothing new is visible yet.
+   */
+  handle(update) {
+    const kind = update.sessionUpdate;
+    if (kind !== "tool_call" && kind !== "tool_call_update") return void 0;
+    const id = update.toolCallId;
+    if (!id) return void 0;
+    let entry = this.tools.get(id);
+    if (!entry) {
+      entry = { announced: false, finished: false };
+      this.tools.set(id, entry);
+    }
+    const meta = toolMeta(update);
+    entry.name ??= meta.name ?? (kind === "tool_call" ? update.title : void 0);
+    entry.label ??= meta.label;
+    if (meta.kind) entry.kind = meta.kind === "write" ? "edit" : meta.kind;
+    if (update.kind) entry.kind = update.kind;
+    if (update.rawInput && typeof update.rawInput === "object") {
+      entry.rawInput = { ...entry.rawInput ?? {}, ...update.rawInput };
+    }
+    if (update.title) entry.title = update.title;
+    if (entry.finished) return void 0;
+    const lines = [];
+    const status = update.status;
+    const done = status === "completed" || status === "failed";
+    const stat = diffStat(update.content);
+    if (stat) entry.stat = stat;
+    const isEdit = entry.kind === "edit" || entry.kind === "delete" || entry.kind === "move";
+    const enriched = kind === "tool_call_update" && Boolean(update.title || update.kind);
+    const ready = isEdit ? done : enriched || done || status === "in_progress";
+    if (!entry.announced && ready) {
+      entry.announced = true;
+      lines.push(`- ${this.describe(entry)}${isEdit && entry.stat ? ` (${entry.stat})` : ""}`);
+      if (done) {
+        entry.finished = true;
+        if (status === "failed") lines.push(`  - \u2717 failed${this.failureDetail(update)}`);
+      }
+    } else if (entry.announced && done) {
+      entry.finished = true;
+      if (status === "failed") {
+        lines.push(`  - \u2717 ${this.describe(entry)} failed${this.failureDetail(update)}`);
+      }
+    }
+    return lines.length ? `${lines.join("\n")}
+` : void 0;
+  }
+  failureDetail(update) {
+    const text2 = firstText(update.content);
+    return text2 ? `: ${this.relativize(oneLine(text2, 200))}` : "";
+  }
+};
+
 // node_modules/@ngosangns/ns-pi-provider/src/grok/acp-mode.ts
 function streamViaAcp(model, context, options) {
   const stream = createAssistantMessageEventStream();
@@ -4698,7 +4876,11 @@ function streamViaAcp(model, context, options) {
       }
       const reasoning = mapReasoningEffort(options?.reasoning);
       const cwd = getSessionCwd();
-      const showTools = envFlag("PI_GROK_SDK_SHOW_TOOLS") || envFlag("PI_GROK_AGENT_SHOW_TOOLS");
+      const showTools = envFlagDefault(
+        ["PI_GROK_SDK_SHOW_TOOLS", "PI_GROK_AGENT_SHOW_TOOLS"],
+        true
+      );
+      const tools = new ToolActivityTracker(cwd);
       const cliModelId = resolveCliModelId(model.id);
       emitter.ensureStart();
       await withSessionAgent(
@@ -4726,9 +4908,9 @@ function streamViaAcp(model, context, options) {
                   emitter.appendThinking(piece);
                 } else if (kind === "agent_message_chunk") {
                   emitter.appendText(piece);
-                } else if (showTools && kind === "tool_call") {
-                  const label = update.title || update.kind || "tool";
-                  emitter.noteActivity(`[grok tool: ${label}]`);
+                } else if (showTools && (kind === "tool_call" || kind === "tool_call_update")) {
+                  const lines = tools.handle(update);
+                  if (lines) emitter.appendToolActivity(lines);
                 }
               });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-omp-provider",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "OMP (oh-my-pi) plugin: Kiro, Devin, and Grok providers from @ngosangns/ns-pi-provider, wrapped for OMP's provider/extension API.",
   "type": "module",
   "license": "MIT",
@@ -70,7 +70,7 @@
     }
   },
   "devDependencies": {
-    "@ngosangns/ns-pi-provider": "0.2.1",
+    "@ngosangns/ns-pi-provider": "0.2.2",
     "@types/node": "^22.18.6",
     "esbuild": "^0.28.2",
     "typescript": "^5.9.2",