@piecemaker-legal/piecemaker 2.0.7 → 2.0.8

package/server/piecemaker/shell-environment.ts

@@ -0,0 +1,111 @@
+import { spawn } from 'node:child_process';
+import { randomUUID } from 'node:crypto';
+import os from 'node:os';
+import path from 'node:path';
+
+import express from 'express';
+
+export type ShellEnvironmentState =
+  | { status: 'inherited' }
+  | { status: 'resolved'; shell: string }
+  | { status: 'failed'; shell: string; reason: string };
+
+const RESOLUTION_TIMEOUT_MS = 10_000;
+
+const RESOLUTION_VARIABLES: Record<string, string> = {
+  ELECTRON_RUN_AS_NODE: '1',
+  ELECTRON_NO_ATTACH_CONSOLE: '1',
+  PIECEMAKER_RESOLVING_ENVIRONMENT: '1',
+  DISABLE_AUTO_UPDATE: 'true',
+  ZSH_TMUX_AUTOSTARTED: 'true',
+  ZSH_TMUX_AUTOSTART: 'false',
+};
+
+const SHELL_SESSION_VARIABLES = new Set(['_', 'PWD', 'OLDPWD', 'SHLVL', ...Object.keys(RESOLUTION_VARIABLES)]);
+
+function quoteForShell(value: string): string {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+
+function userShell(environment: NodeJS.ProcessEnv): string {
+  return environment.SHELL || os.userInfo().shell || '/bin/zsh';
+}
+
+export function extractMarkedEnvironment(output: string, mark: string): Record<string, string> | null {
+  const start = output.indexOf(mark);
+  const end = output.lastIndexOf(mark);
+  if (start === -1 || end <= start) return null;
+  try {
+    return JSON.parse(output.slice(start + mark.length, end));
+  } catch {
+    return null;
+  }
+}
+
+export function adoptShellEnvironment(target: NodeJS.ProcessEnv, shellEnvironment: Record<string, string>) {
+  for (const [key, value] of Object.entries(shellEnvironment)) {
+    if (key === 'PATH' || SHELL_SESSION_VARIABLES.has(key) || target[key] !== undefined) continue;
+    target[key] = value;
+  }
+  const entries = [...(shellEnvironment.PATH ?? '').split(path.delimiter), ...(target.PATH ?? '').split(path.delimiter)];
+  target.PATH = [...new Set(entries.filter(Boolean))].join(path.delimiter);
+}
+
+function readShellEnvironment(shell: string): Promise<Record<string, string>> {
+  const mark = randomUUID().replace(/-/g, '').slice(0, 12);
+  const printEnvironment = `${quoteForShell(process.execPath)} -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`;
+  return new Promise((resolve, reject) => {
+    const child = spawn(shell, ['-i', '-l', '-c', printEnvironment], {
+      detached: true,
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env: { ...process.env, ...RESOLUTION_VARIABLES },
+    });
+    let output = '';
+    let errorOutput = '';
+    const timer = setTimeout(() => {
+      try {
+        process.kill(-child.pid!, 'SIGKILL');
+      } catch {
+        child.kill('SIGKILL');
+      }
+      reject(new Error(`le shell ${shell} n'a pas répondu en ${RESOLUTION_TIMEOUT_MS / 1000} s`));
+    }, RESOLUTION_TIMEOUT_MS);
+    child.stdout.on('data', (chunk: Buffer) => { output += chunk.toString(); });
+    child.stderr.on('data', (chunk: Buffer) => { errorOutput += chunk.toString(); });
+    child.once('error', (error) => {
+      clearTimeout(timer);
+      reject(new Error(`impossible de lancer ${shell} : ${error.message}`));
+    });
+    child.once('close', (code) => {
+      clearTimeout(timer);
+      const environment = extractMarkedEnvironment(output, mark);
+      if (environment) {
+        resolve(environment);
+        return;
+      }
+      const detail = errorOutput.trim().split('\n').slice(-3).join(' ').slice(0, 300);
+      reject(new Error(`le shell ${shell} s'est arrêté (code ${code}) sans fournir son environnement${detail ? ` : ${detail}` : ''}`));
+    });
+  });
+}
+
+export async function resolveDesktopShellEnvironment(): Promise<ShellEnvironmentState> {
+  if (process.platform === 'win32' || process.env.ELECTRON_RUN_AS_NODE !== '1') return { status: 'inherited' };
+  const shell = userShell(process.env);
+  try {
+    adoptShellEnvironment(process.env, await readShellEnvironment(shell));
+    return { status: 'resolved', shell };
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    console.warn(`[piecemaker] environnement du shell non résolu, PATH de base conservé : ${reason}`);
+    return { status: 'failed', shell, reason };
+  }
+}
+
+export function createShellEnvironmentRouter(state: ShellEnvironmentState) {
+  const router = express.Router();
+  router.get('/shell-environment', (_request, response) => {
+    response.json(state);
+  });
+  return router;
+}

package/dist/assets/channel-CVQE_nrA.js

@@ -1 +0,0 @@
-import{ah as o,ai as n}from"./mermaid.core-CcFr1kIk.js";const t=(a,r)=>o.lang.round(n.parse(a)[r]);export{t as c};

package/dist/assets/classDiagram-ZZMXUADV-BNp5yxXb.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-TICWLB2K-DIabeuUc.js";import{_ as i}from"./mermaid.core-CcFr1kIk.js";import"./chunk-5VM5RSS4-CnDRnclp.js";import"./chunk-XXDRQBXY-D9_LHetz.js";import"./chunk-POPQ4Y6H-C2tl1RjW.js";import"./chunk-F27PBJKO-vgneLl23.js";import"./index-Dhev0IBD.js";import"./vendor-codemirror-CjW0lHR5.js";import"./vendor-react-D809iwXR.js";import"./vendor-xterm-BWUgpGtR.js";var c={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{c as diagram};

package/dist/assets/classDiagram-v2-VYDZK3BY-BNp5yxXb.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-TICWLB2K-DIabeuUc.js";import{_ as i}from"./mermaid.core-CcFr1kIk.js";import"./chunk-5VM5RSS4-CnDRnclp.js";import"./chunk-XXDRQBXY-D9_LHetz.js";import"./chunk-POPQ4Y6H-C2tl1RjW.js";import"./chunk-F27PBJKO-vgneLl23.js";import"./index-Dhev0IBD.js";import"./vendor-codemirror-CjW0lHR5.js";import"./vendor-react-D809iwXR.js";import"./vendor-xterm-BWUgpGtR.js";var c={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{c as diagram};

package/dist/assets/swimlanesDiagram-VR7AAH4N-CzQACmEN.js

@@ -1,8 +0,0 @@
-import{c as r,s as e}from"./flowDiagram-HODETNUW-C87EKwuJ.js";import{_ as a}from"./mermaid.core-CcFr1kIk.js";import"./chunk-5VM5RSS4-CnDRnclp.js";import"./chunk-XXDRQBXY-D9_LHetz.js";import"./chunk-POPQ4Y6H-C2tl1RjW.js";import"./chunk-F27PBJKO-vgneLl23.js";import"./index-Dhev0IBD.js";import"./vendor-codemirror-CjW0lHR5.js";import"./vendor-react-D809iwXR.js";import"./vendor-xterm-BWUgpGtR.js";import"./channel-CVQE_nrA.js";var o=a(t=>`${e(t)}
-  .swimlane.cluster rect {
-    stroke: ${t.clusterBorder} !important;
-  }
-  [data-look="neo"].cluster rect {
-    filter: none;
-  }
-`,"getStyles"),m=o,g=r({defaultLayout:"swimlane",styles:m});export{g as diagram};

package/dist-server/server/piecemaker/claude-executable.js

@@ -1,41 +0,0 @@
-import fs from 'node:fs';
-import { createRequire } from 'node:module';
-import path from 'node:path';
-function isExecutableFile(candidate) {
-    try {
-        fs.accessSync(candidate, fs.constants.X_OK);
-        return fs.statSync(candidate).isFile();
-    }
-    catch {
-        return false;
-    }
-}
-function bundledSdkExecutable() {
-    try {
-        const packageName = `@anthropic-ai/claude-agent-sdk-${process.platform}-${process.arch}`;
-        return createRequire(import.meta.url).resolve(`${packageName}/claude`);
-    }
-    catch {
-        return null;
-    }
-}
-export function claudeExecutableFallback(context) {
-    if (context.platform === 'win32' || context.environment.CLAUDE_CLI_PATH)
-        return null;
-    const searchPath = (context.environment.PATH || '').split(path.delimiter).filter(Boolean);
-    if (searchPath.some((directory) => context.isExecutable(path.join(directory, 'claude'))))
-        return null;
-    const bundled = context.bundledExecutable();
-    return bundled && context.isExecutable(bundled) ? bundled : null;
-}
-export function useBundledClaudeWhenMissingFromPath() {
-    const fallback = claudeExecutableFallback({
-        environment: process.env,
-        platform: process.platform,
-        isExecutable: isExecutableFile,
-        bundledExecutable: bundledSdkExecutable,
-    });
-    if (fallback)
-        process.env.CLAUDE_CLI_PATH = fallback;
-}
-//# sourceMappingURL=claude-executable.js.map

package/dist-server/server/piecemaker/claude-executable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"claude-executable.js","sourceRoot":"","sources":["../../../server/piecemaker/claude-executable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAS7B,SAAS,gBAAgB,CAAC,SAAiB;IACzC,IAAI,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB;IAC3B,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,kCAAkC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACzF,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,WAAW,SAAS,CAAC,CAAC;IACzE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAgC;IACvE,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,eAAe;QAAE,OAAO,IAAI,CAAC;IACrF,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1F,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACtG,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAC5C,OAAO,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,mCAAmC;IACjD,MAAM,QAAQ,GAAG,wBAAwB,CAAC;QACxC,WAAW,EAAE,OAAO,CAAC,GAAG;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,YAAY,EAAE,gBAAgB;QAC9B,iBAAiB,EAAE,oBAAoB;KACxC,CAAC,CAAC;IACH,IAAI,QAAQ;QAAE,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,QAAQ,CAAC;AACvD,CAAC"}

package/server/piecemaker/claude-executable.ts

@@ -1,46 +0,0 @@
-import fs from 'node:fs';
-import { createRequire } from 'node:module';
-import path from 'node:path';
-
-type ClaudeExecutableContext = {
-  environment: NodeJS.ProcessEnv;
-  platform: NodeJS.Platform;
-  isExecutable(candidate: string): boolean;
-  bundledExecutable(): string | null;
-};
-
-function isExecutableFile(candidate: string): boolean {
-  try {
-    fs.accessSync(candidate, fs.constants.X_OK);
-    return fs.statSync(candidate).isFile();
-  } catch {
-    return false;
-  }
-}
-
-function bundledSdkExecutable(): string | null {
-  try {
-    const packageName = `@anthropic-ai/claude-agent-sdk-${process.platform}-${process.arch}`;
-    return createRequire(import.meta.url).resolve(`${packageName}/claude`);
-  } catch {
-    return null;
-  }
-}
-
-export function claudeExecutableFallback(context: ClaudeExecutableContext): string | null {
-  if (context.platform === 'win32' || context.environment.CLAUDE_CLI_PATH) return null;
-  const searchPath = (context.environment.PATH || '').split(path.delimiter).filter(Boolean);
-  if (searchPath.some((directory) => context.isExecutable(path.join(directory, 'claude')))) return null;
-  const bundled = context.bundledExecutable();
-  return bundled && context.isExecutable(bundled) ? bundled : null;
-}
-
-export function useBundledClaudeWhenMissingFromPath() {
-  const fallback = claudeExecutableFallback({
-    environment: process.env,
-    platform: process.platform,
-    isExecutable: isExecutableFile,
-    bundledExecutable: bundledSdkExecutable,
-  });
-  if (fallback) process.env.CLAUDE_CLI_PATH = fallback;
-}