@piecemaker-legal/piecemaker 1.0.7 → 1.0.8

package/scripts/piecemaker/cli/lib/pwa.mjs

@@ -46,7 +46,7 @@ export async function verifyPwaAssets() {
   };
 }
 
-function macChromiumBrowser() {
+export function macChromiumBrowser() {
   const candidates = [
     '/Applications/Google Chrome.app',
     '/Applications/Microsoft Edge.app',
@@ -103,13 +103,12 @@ function installMacApplication() {
   fs.mkdirSync(resourcesDir, { recursive: true });
 
   const browser = macChromiumBrowser();
-  const launchCommand = browser
-    ? `open -na "${browser}" --args --app="${APP_URL}" --user-data-dir="$HOME/.piecemaker/pwa-profile"`
-    : `open "${APP_URL}"`;
-
   const launcherPath = path.join(macosDir, APPLICATION_NAME);
   const command = piecemakerExecutable();
-  fs.writeFileSync(launcherPath, `#!/bin/sh\n${shellQuote(command)} --launch-only >/dev/null 2>&1 &\nsleep 2\n${launchCommand}\n`, 'utf8');
+  const launchCommand = browser
+    ? `exec ${shellQuote(command)} --window >/dev/null 2>&1`
+    : `open "${APP_URL}"`;
+  fs.writeFileSync(launcherPath, `#!/bin/sh\n${shellQuote(command)} --launch-only >/dev/null 2>&1\n${launchCommand}\n`, 'utf8');
   fs.chmodSync(launcherPath, 0o755);
 
   const iconFile = writeMacIcon(resourcesDir);
@@ -209,7 +208,7 @@ function writeWindowsIcon() {
   }
 }
 
-function windowsChromiumBrowser() {
+export function windowsChromiumBrowser() {
   const programFiles = process.env['ProgramFiles'] || 'C:\\Program Files';
   const programFilesX86 = process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)';
   const localAppData = process.env.LOCALAPPDATA || '';
@@ -283,15 +282,14 @@ function createWindowsShortcut(shortcutPath, targetPath, shortcutArgs, iconPath)
   return result.code === 0;
 }
 
-function writeWindowsLauncher(browser, userDataDir) {
+function writeWindowsLauncher(browser) {
   const command = piecemakerExecutable();
   const lines = [
     '@echo off',
-    `start "" /B "${command}" --launch-only`,
-    'ping 127.0.0.1 -n 3 >nul',
+    `call "${command}" --launch-only`,
   ];
   if (browser) {
-    lines.push(`start "" "${browser}" --app=${APP_URL} --user-data-dir=${userDataDir}`);
+    lines.push(`call "${command}" --window`);
   } else {
     lines.push(`start "" "${APP_URL}"`);
   }
@@ -304,8 +302,7 @@ function writeWindowsLauncher(browser, userDataDir) {
 function installWindowsApplication() {
   const browser = windowsChromiumBrowser();
   const iconPath = writeWindowsIcon();
-  const userDataDir = path.join(os.homedir(), '.piecemaker', 'pwa-profile');
-  const launcher = writeWindowsLauncher(browser, userDataDir);
+  const launcher = writeWindowsLauncher(browser);
 
   const desktopDir = windowsDesktopDir();
   const startMenuDir = windowsStartMenuDir();

package/scripts/piecemaker/cli/piecemaker.mjs

@@ -9,6 +9,7 @@ import { gitAvailable, resolveNodeRuntime } from './lib/node-runtime.mjs';
 import { ensureDependencies, ensureRepository, rebuildNativeModules } from './lib/repos.mjs';
 import { APP_LOG, appClientReachable, appServerReachable, startApplication, stopApplication } from './lib/services.mjs';
 import { applicationWindowIsOpen, installApplicationEntry, openApplication, verifyPwaAssets } from './lib/pwa.mjs';
+import { runApplicationWindow } from './lib/app-window.mjs';
 import { banner, blank, c, detail, fail, ok, step, warn } from './lib/ui.mjs';
 
 const report = { step, ok, warn, detail };
@@ -17,13 +18,16 @@ const HELP = `${c.bold('piecemaker')} — installe, met à jour, répare et lanc
 
   piecemaker                 reset propre, puis installation et lancement
   piecemaker --launch-only   répare et relance seulement si l'application est arrêtée
+  piecemaker --window        relance si besoin, ouvre la fenêtre et arrête tout à sa fermeture
   piecemaker --help          cette aide
 `;
 
 function parseArguments(argv) {
+  const window = argv.includes('--window');
   return {
     help: argv.includes('--help') || argv.includes('-h'),
-    launchOnly: argv.includes('--launch-only'),
+    launchOnly: argv.includes('--launch-only') || window,
+    window,
   };
 }
 
@@ -148,6 +152,16 @@ async function main() {
   detail('Configuration du socle : onglet Dossier › Configuration.');
   blank();
 
+  if (options.window) {
+    const session = await runApplicationWindow();
+    if (!session.supervised) {
+      warn(`Fenêtre non supervisée : ${session.reason}`);
+      return 0;
+    }
+    ok('Fenêtre fermée — application arrêtée');
+    return 0;
+  }
+
   if (!options.launchOnly && !applicationWindowIsOpen()) openApplication();
   return 0;
 }

package/server/modules/cli/desktop-shortcut.ts

@@ -0,0 +1,89 @@
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+type ShortcutOutput = {
+  log(message: string): void;
+};
+
+const SHORTCUT_NAME = 'PieceMaker';
+
+function desktopDirectory(): string {
+  return process.env.PIECEMAKER_DESKTOP_DIR || path.join(os.homedir(), 'Desktop');
+}
+
+function launchCommand(): { executable: string; argument: string } {
+  return { executable: process.execPath, argument: process.argv[1] || '' };
+}
+
+function createMacShortcut(desktop: string): string | null {
+  const { executable, argument } = launchCommand();
+  if (!argument) return null;
+  const bundle = path.join(desktop, `${SHORTCUT_NAME}.app`);
+  if (fs.existsSync(bundle)) return null;
+
+  const macOsDirectory = path.join(bundle, 'Contents', 'MacOS');
+  fs.mkdirSync(macOsDirectory, { recursive: true });
+  fs.writeFileSync(
+    path.join(bundle, 'Contents', 'Info.plist'),
+    `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleName</key><string>${SHORTCUT_NAME}</string>
+  <key>CFBundleIdentifier</key><string>legal.piecemaker.launcher</string>
+  <key>CFBundleExecutable</key><string>${SHORTCUT_NAME}</string>
+  <key>CFBundlePackageType</key><string>APPL</string>
+  <key>LSUIElement</key><true/>
+</dict>
+</plist>
+`,
+  );
+
+  const launcher = path.join(macOsDirectory, SHORTCUT_NAME);
+  fs.writeFileSync(launcher, `#!/bin/sh\nexec ${JSON.stringify(executable)} ${JSON.stringify(argument)} start\n`);
+  fs.chmodSync(launcher, 0o755);
+  return bundle;
+}
+
+function createWindowsShortcut(desktop: string): string | null {
+  const { executable, argument } = launchCommand();
+  if (!argument) return null;
+  const shortcut = path.join(desktop, `${SHORTCUT_NAME}.lnk`);
+  if (fs.existsSync(shortcut)) return null;
+
+  const script = [
+    '$shell = New-Object -ComObject WScript.Shell',
+    `$shortcut = $shell.CreateShortcut(${JSON.stringify(shortcut)})`,
+    `$shortcut.TargetPath = ${JSON.stringify(executable)}`,
+    `$shortcut.Arguments = ${JSON.stringify(`${JSON.stringify(argument)} start`)}`,
+    `$shortcut.WorkingDirectory = ${JSON.stringify(path.dirname(executable))}`,
+    '$shortcut.WindowStyle = 7',
+    `$shortcut.Description = ${JSON.stringify('Ouvre PieceMaker')}`,
+    '$shortcut.Save()',
+  ].join('; ');
+  execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script], { stdio: 'ignore' });
+  return shortcut;
+}
+
+/**
+ * Creates the PieceMaker desktop icon once, right after a fresh install, so the
+ * application can be reopened without a terminal. Existing shortcuts are left
+ * untouched and any failure is reported without interrupting the launch.
+ */
+export function ensureDesktopShortcut(output: ShortcutOutput): void {
+  if (process.platform !== 'darwin' && process.platform !== 'win32') return;
+
+  const desktop = desktopDirectory();
+  if (!fs.existsSync(desktop)) return;
+
+  try {
+    const created = process.platform === 'darwin'
+      ? createMacShortcut(desktop)
+      : createWindowsShortcut(desktop);
+    if (created) output.log(`[OK] PieceMaker desktop icon created at ${created}`);
+  } catch {
+    output.log('[WARN] Could not create the PieceMaker desktop icon.');
+  }
+}

package/server/modules/cli/pwa-launcher.ts

@@ -4,6 +4,8 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 
+import { ensureDesktopShortcut } from './desktop-shortcut.js';
+
 type PwaOutput = {
   log(message: string): void;
 };
@@ -102,7 +104,22 @@ async function waitForServer(url: string): Promise<boolean> {
   return false;
 }
 
-/** Starts PieceMaker in an isolated Chromium app window after its backend is ready. */
+const SHUTDOWN_GRACE_MS = 10_000;
+const DELEGATED_LAUNCH_MS = 3_000;
+
+function shutdownAfterWindowClosed(output: PwaOutput): void {
+  output.log('[OK] PieceMaker window closed; stopping the local server.');
+  const forced = setTimeout(() => process.exit(0), SHUTDOWN_GRACE_MS);
+  forced.unref();
+  if (process.listenerCount('SIGTERM') > 0) process.emit('SIGTERM', 'SIGTERM');
+  else process.exit(0);
+}
+
+/**
+ * Starts PieceMaker in an isolated Chromium app window after its backend is
+ * ready, and ties the server's lifetime to that window: closing it shuts the
+ * local server down through the same graceful path as SIGTERM.
+ */
 export async function launchPwa(output: PwaOutput = DEFAULT_OUTPUT): Promise<void> {
   const url = pwaUrl();
   if (!(await waitForServer(url))) {
@@ -116,16 +133,24 @@ export async function launchPwa(output: PwaOutput = DEFAULT_OUTPUT): Promise<voi
     return;
   }
 
+  ensureDesktopShortcut(output);
+
   const profileDirectory = pwaProfileDirectory();
   fs.mkdirSync(profileDirectory, { recursive: true });
+  const openedAt = Date.now();
   const child = spawn(browser, [`--app=${url}`, `--user-data-dir=${profileDirectory}`], {
-    detached: true,
     stdio: 'ignore',
     windowsHide: true,
   });
   child.on('error', () => {
     output.log(`[WARN] Could not open the PieceMaker PWA; open ${url} manually.`);
   });
-  child.unref();
-  output.log(`[OK] PieceMaker PWA opened at ${url}`);
+  child.on('exit', () => {
+    if (Date.now() - openedAt < DELEGATED_LAUNCH_MS) {
+      output.log(`[WARN] The PieceMaker window is owned by another browser process; the server keeps running.`);
+      return;
+    }
+    shutdownAfterWindowClosed(output);
+  });
+  output.log(`[OK] PieceMaker PWA opened at ${url} — closing the window stops the server.`);
 }

package/dist/assets/channel-BbcW_Tkh.js

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

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

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-TICWLB2K-CL1LytYG.js";import{_ as i}from"./mermaid.core-DFqeWtQR.js";import"./chunk-5VM5RSS4-SdXpal6h.js";import"./chunk-XXDRQBXY-7U9iRPT1.js";import"./chunk-POPQ4Y6H-dMs1OCce.js";import"./chunk-F27PBJKO-Rof94ueX.js";import"./index-BqK33gaZ.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-D9_YRZ7i.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-TICWLB2K-CL1LytYG.js";import{_ as i}from"./mermaid.core-DFqeWtQR.js";import"./chunk-5VM5RSS4-SdXpal6h.js";import"./chunk-XXDRQBXY-7U9iRPT1.js";import"./chunk-POPQ4Y6H-dMs1OCce.js";import"./chunk-F27PBJKO-Rof94ueX.js";import"./index-BqK33gaZ.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-CJbgQFt8.js

@@ -1,8 +0,0 @@
-import{c as r,s as e}from"./flowDiagram-HODETNUW-BwSkJXCo.js";import{_ as a}from"./mermaid.core-DFqeWtQR.js";import"./chunk-5VM5RSS4-SdXpal6h.js";import"./chunk-XXDRQBXY-7U9iRPT1.js";import"./chunk-POPQ4Y6H-dMs1OCce.js";import"./chunk-F27PBJKO-Rof94ueX.js";import"./index-BqK33gaZ.js";import"./vendor-codemirror-CjW0lHR5.js";import"./vendor-react-D809iwXR.js";import"./vendor-xterm-BWUgpGtR.js";import"./channel-BbcW_Tkh.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};