dsh-gitbash-shell 0.39.1 → 0.39.3

package/src/client.js

@@ -2063,6 +2063,42 @@ window.__ModuleLoader__.load({
 				if (scope && typeof scope.getSnapshot === "function") snap = scope.getSnapshot();
 			} catch (error_) { /* keep unavailable */ }
 
+			var pageView = props.view === "page";
+
+			// Hooks run for every snapshot state; readiness only gates their work.
+			useEffect(function () {
+				if (snap.status !== "ready" || (!open && !pageView)) return undefined;
+				if (toolsLoaded || toolBusy) return undefined;
+				loadTools();
+				return undefined;
+			}, [open, pageView, snap.status]);
+
+			/* Poll ONLY while a job is unfinished, and through the cheap ?job=1
+			   form. A transient failure retries without discarding progress. */
+			useEffect(function () {
+				if (snap.status !== "ready" || toolJob === null || toolJob.finished) return undefined;
+				var alive = true;
+				var timer;
+				function schedule() {
+					timer = setTimeout(function () {
+						fetch(TOOLS_URL + "?job=1", { headers: { accept: "application/json" } })
+							.then(function (res) {
+								if (!res.ok) throw new Error("HTTP " + res.status);
+								return res.json();
+							})
+							.then(function (data) {
+								if (!alive) return;
+								var next = data !== null && typeof data === "object" && data.job ? data.job : null;
+								setToolJob(next);
+								if (next !== null && next.finished) loadTools();
+							})
+							.catch(function () { if (alive) schedule(); });
+					}, 1200);
+				}
+				schedule();
+				return function () { alive = false; clearTimeout(timer); };
+			}, [toolJob, snap.status]);
+
 			if (snap.status !== "ready") return null;
 
 			var value = snap.value || {};
@@ -2135,7 +2171,6 @@ window.__ModuleLoader__.load({
 			// dsh 0.1.6-alpha.2: the Plugins page renders this card through the
 			// `plugins.bundle.config` slot with view="page" — the page draws the
 			// title itself; the collapsible shell only shows on the popup seat.
-			var pageView = props.view === "page";
 
 			var mounts = snap.value.virtualMounts !== false;
 			var errs = snap.value.errorDialect !== false;
@@ -2469,30 +2504,6 @@ window.__ModuleLoader__.load({
 					.then(function () { setToolBusy(false); });
 			}
 
-			useEffect(function () {
-				if (!open && !pageView) return undefined;
-				if (toolsLoaded || toolBusy) return undefined;
-				loadTools();
-				return undefined;
-			}, [open]);
-
-			/* Poll ONLY while a job is unfinished, and through the cheap ?job=1
-			   form: a full probe re-runs three winget commands per second. */
-			useEffect(function () {
-				if (toolJob === null || toolJob.finished) return undefined;
-				var timer = setTimeout(function () {
-					fetch(TOOLS_URL + "?job=1", { headers: { accept: "application/json" } })
-						.then(function (res) { return res.json(); })
-						.then(function (data) {
-							var next = data !== null && typeof data === "object" && data.job ? data.job : null;
-							setToolJob(next);
-							if (next !== null && next.finished) loadTools();
-						})
-						.catch(function () { /* keep the last known progress */ });
-				}, 1200);
-				return function () { clearTimeout(timer); };
-			}, [toolJob]);
-
 			var toolsSection = fold("sec.tools",
 					toolsData === null && toolErr === "" ? E("p", { className: "gb-hint" }, t("tools.loading")) : null,
 					toolErr !== "" ? E("p", { className: "gb-error" }, toolErr) : null,

package/src/compositions.js

@@ -9,10 +9,10 @@
  *
  * Every variant mirrors the official 0.1.7 preset it replaces (packages/
  * bundle/web-app/presets/{standard,minimal,ptc,cordis}.patch.yml) with the
- * one Git Bash delta: the bash rows are always on and the pwsh rows are
- * always off (the plugin ships its OWN bash tool over a private executor —
- * on non-Windows hosts the official stack is native anyway, which is exactly
- * what the old materialized variants encoded). A second, conditional delta exists while
+ * Git Bash routing: full variants keep the official platform-gated shell
+ * rows, and the inline patch adds OUR bash over a private executor on Windows.
+ * The minimal variant instead keeps its persistent Git Bash terminal rows.
+ * On non-Windows hosts the official stack stays native. A conditional delta exists while
  * dsh-ptc-cordis-preset reports its experimental-CPython backend ACTIVE: the
  * two workflow rows follow the official Python composition and go off (see
  * `pythonActive` below). While that backend is off — the default, and also
@@ -56,7 +56,8 @@ const planSectionFor = (hostEra021) => hostEra021
  * @param {'standard'|'ptc'|'cordis'} input.kind - which official preset this
  *   variant mirrors (workflow rows follow it: enabled on standard/cordis,
  *   disabled on ptc).
- * @param {boolean} input.gitBash - bash rows always on, pwsh rows always off.
+ * @param {boolean} input.gitBash - retained for composition-call compatibility;
+ *   full variants obtain Git Bash from the per-agent inline patch on Windows.
  * @param {string|undefined} input.skillsDir - Creation authoring skills
  *   directory (cordis variant only; resolved beside the agent-preset package).
  * @param {boolean} [input.pythonActive] - whether the experimental CPython
@@ -75,8 +76,11 @@ const planSectionFor = (hostEra021) => hostEra021
  */
 export function pluginsFor({ kind, gitBash, skillsDir, pythonActive = false, hostExtras = {} }) {
   const win = typeof process !== 'undefined' && process.platform === 'win32'
-  const bashDisabled = gitBash ? false : win
-  const pwshDisabled = gitBash ? true : !win
+  // Route B preserves the root PowerShell executor. On Windows the official
+  // tool-bash would execute through that executor, so full variants retain the
+  // official pwsh face and let the same per-agent inline patch add OUR bash.
+  const bashDisabled = win
+  const pwshDisabled = !win
   const workflowOn = kind !== 'ptc' && pythonActive !== true
   // dsh 0.2.1 added two rows to every full-tool official preset — time-context
   // (durable clock readings) and tool-schedule (the reminder tools) — plus a

package/src/fastctx-bridge.js

@@ -106,20 +106,21 @@ export class McpStdio {
     this.child.stderr.on('data', (chunk) => {
       this.stderrTail = (this.stderrTail + chunk).slice(-2000)
     })
-    this.child.on('exit', (code) => {
-      this.dead = true
-      for (const [, { reject }] of [...this.pending]) {
-        reject(new Error(`the FastCtx server exited (code ${code ?? 'null'})`))
-      }
-      this.pending.clear()
-    })
-    await this.#request('initialize', {
-      protocolVersion: '2024-11-05',
-      capabilities: {},
-      clientInfo: { name: 'dsh-gitbash-shell', version: '0.35.0' },
-    })
-    this.#notify('notifications/initialized')
-    return this
+    this.child.on('error', (error) => this.#fail(error))
+    this.child.stdin.on('error', (error) => this.#fail(error))
+    this.child.on('exit', (code) => this.#fail(new Error(`the FastCtx server exited (code ${code ?? 'null'})`)))
+    try {
+      await this.#request('initialize', {
+        protocolVersion: '2024-11-05',
+        capabilities: {},
+        clientInfo: { name: 'dsh-gitbash-shell', version: '0.35.0' },
+      })
+      this.#notify('notifications/initialized')
+      return this
+    } catch (error) {
+      await this.close()
+      throw error
+    }
   }
 
   /** List the server's tools: [{ name, description, inputSchema }]. */
@@ -140,15 +141,21 @@ export class McpStdio {
     this.dead = true
     const child = this.child
     this.child = undefined
-    for (const [, { reject }] of [...this.pending]) {
-      reject(new Error('the FastCtx bridge was stopped'))
-    }
-    this.pending.clear()
+    this.#fail(new Error('the FastCtx bridge was stopped'))
     if (child && child.exitCode === null && !child.killed) {
       try { child.kill() } catch { /* already gone */ }
     }
   }
 
+  #fail(error) {
+    this.dead = true
+    for (const { reject, timer } of this.pending.values()) {
+      clearTimeout(timer)
+      reject(error)
+    }
+    this.pending.clear()
+  }
+
   #onChunk(chunk) {
     this.buffer += chunk
     let at = this.buffer.indexOf('\n')
@@ -310,6 +317,10 @@ export function mountFastctx(ctx, deps) {
   let client = undefined
   let decided = false
   let withdrawnByOps = false
+  let closed = false
+  let publishing
+  let connecting
+  const starting = new Set()
 
   const unpublish = (reason) => {
     if (disposer) {
@@ -320,16 +331,34 @@ export function mountFastctx(ctx, deps) {
   }
 
   const callWithReconnect = async (rawName, args) => {
+    if (closed || withdrawnByOps) throw new Error('the FastCtx bridge was stopped')
     if (client === undefined || client.isDead) {
-      const { file } = resolveFastctx(ctx, createRequireFrom)
-      if (file === '') throw new Error('the FastCtx payload is not installed; repair the profile dependencies (frozen install) and retry')
-      client = await new McpStdio({ file, log }).start()
+      if (!connecting) {
+        connecting = (async () => {
+          const { file } = resolveFastctx(ctx, createRequireFrom)
+          if (file === '') throw new Error('the FastCtx payload is not installed; repair the profile dependencies (frozen install) and retry')
+          const fresh = new McpStdio({ file, log })
+          starting.add(fresh)
+          try {
+            await fresh.start()
+            if (closed || withdrawnByOps) throw new Error('the FastCtx bridge was stopped')
+            client = fresh
+          } catch (error) {
+            await fresh.close()
+            throw error
+          } finally {
+            starting.delete(fresh)
+          }
+        })().finally(() => { connecting = undefined })
+      }
+      await connecting
     }
+    if (closed || withdrawnByOps) throw new Error('the FastCtx bridge was stopped')
     return client.callTool(rawName, args)
   }
 
-  const publish = async () => {
-    if (disposer || decided && withdrawnByOps) return
+  const publishOnce = async () => {
+    if (closed || disposer || decided && withdrawnByOps) return
     const registry = tools(ctx)
     if (!registry || typeof registry.register !== 'function') return
     const { file, source } = resolveFastctx(ctx, createRequireFrom)
@@ -340,6 +369,7 @@ export function mountFastctx(ctx, deps) {
       return
     }
     const fresh = new McpStdio({ file, log })
+    starting.add(fresh)
     let toolList
     try {
       await fresh.start()
@@ -350,9 +380,12 @@ export function mountFastctx(ctx, deps) {
       decided = true
       withdrawnByOps = true
       return
+    } finally {
+      starting.delete(fresh)
     }
     await fresh.close()
-    client = undefined // the first call re-launches lazily; boot stays cheap
+    if (closed || withdrawnByOps) return
+    // Discovery never overwrites the independently owned lazy call client.
     const wanted = toolList.filter((tool) => FASTCTX_FILE_TOOLS.includes(String(tool?.name)))
     const registered = []
     const registeredNames = []
@@ -386,16 +419,20 @@ export function mountFastctx(ctx, deps) {
             schema: TOOL_OUTPUT_SCHEMA,
             render: (_args, value) => renderTextContent(value),
           },
-          async execute(args) {
-            // Fail LOUD on malformed patterns (v0.38.5; reshaped v0.39.1,
-            // issue #21 — see validateFastctxPattern).
+          async execute(args, execution) {
+            // Preserve v0.39.1 / #21: glob accepts real string arrays,
+            // while stringified arrays and malformed patterns fail loudly.
             if (args !== null && typeof args === 'object' && 'pattern' in args) {
               const invalid = validateFastctxPattern(rawName, args.pattern)
               if (invalid) throw new Error(invalid)
             }
-            const translated = translateFastctxArgs(args, msysToWin)
+            const translated = translateFastctxArgs(args, msysToWin ? (path) => msysToWin(path, execution) : undefined)
             const result = await callWithReconnect(rawName, translated)
-            return { content: [{ type: 'text', text: renderFastctxResult(rawName, result, echo) }] }
+            const text = renderFastctxResult(rawName, result, echo ? (value) => echo(value, execution) : undefined)
+            // The host treats a returned value as success; MCP failures must
+            // throw, just as its official MCP client does.
+            if (result?.isError === true) throw new Error(text)
+            return { content: [{ type: 'text', text }] }
           },
         })
         if (typeof dispose === 'function') {
@@ -416,7 +453,13 @@ export function mountFastctx(ctx, deps) {
     log(`FastCtx bridge active (${source}): ${registeredNames.join(', ')}`)
   }
 
+  const publish = () => {
+    if (!publishing) publishing = publishOnce().finally(() => { publishing = undefined })
+    return publishing
+  }
+
   const reconcile = (agent) => {
+    if (closed) return
     if (!enabled()) { unpublish('FastCtx bridge disabled by the fastctxTools switch'); decided = true; withdrawnByOps = true; return }
     if (decided && withdrawnByOps) return
     let names = []
@@ -440,8 +483,12 @@ export function mountFastctx(ctx, deps) {
     log(`FastCtx bridge wiring failed: ${error?.message ?? error}`)
     return
   }
-  ctx.effect(() => () => {
+  ctx.effect(() => async () => {
+    closed = true
     unpublish()
-    if (client) { void client.close().catch(() => {}) }
+    const owned = new Set([...starting, client].filter(Boolean))
+    await Promise.allSettled([...owned].map((connection) => connection.close()))
+    await Promise.allSettled([publishing, connecting].filter(Boolean))
+    client = undefined
   }, 'dsh-gitbash-shell: FastCtx bridge')
 }