@mmmbuto/nexuscrew 0.8.0 → 0.8.3

package/lib/cli/init.js

@@ -8,6 +8,7 @@
 const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
+const crypto = require('node:crypto');
 const { detectPlatform, nodeBin, repoRoot, uid } = require('./platform.js');
 const { loadOrCreateToken } = require('../auth/token.js');
 const { generateService, installService, fileMode, installPath: svcInstallPath } = require('./service.js');
@@ -28,6 +29,24 @@ function nodeMajor() {
   return parseInt(String(process.versions.node).split('.')[0], 10);
 }
 
+function writeConfigAtomic(configPath, value) {
+  try {
+    if (fs.lstatSync(configPath).isSymbolicLink()) throw new Error('refusing symlink config target');
+  } catch (e) {
+    if (e.code !== 'ENOENT') throw e;
+  }
+  fs.mkdirSync(path.dirname(configPath), { recursive: true });
+  const tmp = path.join(path.dirname(configPath), `.${path.basename(configPath)}.${crypto.randomBytes(6).toString('hex')}.tmp`);
+  try {
+    fs.writeFileSync(tmp, `${JSON.stringify(value, null, 2)}\n`, { mode: 0o600 });
+    fs.chmodSync(tmp, 0o600);
+    fs.renameSync(tmp, configPath);
+  } catch (e) {
+    try { fs.unlinkSync(tmp); } catch (_) {}
+    throw e;
+  }
+}
+
 // Migration rule (B2): se non c'è config.json, parse la porta dal service file esistente.
 function readExistingPort(platform, home, installPathOverride) {
   const p = installPathOverride || svcInstallPath(platform, home);
@@ -56,6 +75,7 @@ function runInit(opts = {}) {
   const tokenPath = opts.tokenPath || path.join(configDir, 'token');
   const filesRoot = opts.filesRoot || path.join(home, 'NexusFiles');
   const dryRun = !!opts.dryRun;
+  const installBoot = opts.installBoot !== false;
   const log = opts.log || (() => {});
   const tmuxOk = opts.tmuxOk !== undefined ? opts.tmuxOk : haveTmux(opts.tmuxBin || 'tmux');
 
@@ -78,24 +98,30 @@ function runInit(opts = {}) {
     fs.mkdirSync(configDir, { recursive: true });
     if (!fs.existsSync(configPath)) {
       if (!port) port = 41820;
-      fs.writeFileSync(configPath, JSON.stringify({ port }, null, 2) + '\n', { mode: 0o600 });
+      writeConfigAtomic(configPath, { port });
       actions.push(`created config ${configPath} (port ${port})`);
     } else {
+      let current;
       try {
-        const c = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-        if (c && c.port) port = c.port;
-      } catch (_) {}
+        current = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+      } catch (_) { current = {}; }
+      if (opts.port) {
+        current.port = opts.port;
+        port = opts.port;
+        writeConfigAtomic(configPath, current);
+        actions.push(`updated config ${configPath} (port ${port})`);
+      } else if (current && current.port) port = current.port;
       actions.push(`preserved config ${configPath} (port ${port})`);
     }
   }
 
-  // Fleet app defaults: soltanto i due client nativi. Provider cloud/Z.AI sono
+  // Fleet app defaults: soltanto i tre client nativi. Provider cloud/Z.AI sono
   // disponibili nel catalogo managed ma vanno aggiunti esplicitamente.
   const fleetDefsPath = opts.fleetDefsPath || path.join(configDir, 'fleet.json');
   if (!dryRun && !fs.existsSync(fleetDefsPath)) {
     try {
       writeFleet(fleetDefsPath, defaultDefinitions());
-      actions.push(`created fleet defaults ${fleetDefsPath} (claude.native, codex-vl.native)`);
+      actions.push(`created fleet defaults ${fleetDefsPath} (claude.native, codex.native, codex-vl.native)`);
     } catch (e) {
       actions.push(`WARN: fleet defaults non creati: ${e.message}`);
     }
@@ -144,7 +170,9 @@ function runInit(opts = {}) {
   };
   const content = generateService(platform, svcCtx);
 
-  if (dryRun) {
+  if (!installBoot) {
+    actions.push(`boot opt-in: service ${platform} non installato`);
+  } else if (dryRun) {
     actions.push(`DRY-RUN service (${platform}) generato, NON installato`);
   } else if (!tmuxOk) {
     // tmux mancante: abort before service install (config/token gia' creati) [M8]
@@ -171,7 +199,9 @@ function runInit(opts = {}) {
   // principale: ogni errore del companion -> WARN action + return normale.
   try {
     const readonly = process.env.NEXUSCREW_READONLY === '1' || opts.readonly;
-    if (readonly) {
+    if (!installBoot) {
+      actions.push('fleet companion: boot opt-in, non installato');
+    } else if (readonly) {
       actions.push('fleet companion: READONLY, non installato');
     } else {
       // provider mode: companion SOLO se builtin (§9b). selectProviderModeSync e'
@@ -226,7 +256,7 @@ function runInit(opts = {}) {
   }
 
   // Termux:boot best-effort detection (R4)
-  if (platform === 'termux') {
+  if (platform === 'termux' && installBoot) {
     const bootDir = path.join(home, '.termux', 'boot');
     const bootOk = fs.existsSync(bootDir);
     actions.push(bootOk
@@ -246,4 +276,4 @@ function runInit(opts = {}) {
   return { platform, port, token, url: urlWithToken, actions, tmuxOk, dryRun };
 }
 
-module.exports = { runInit, readExistingPort, haveTmux, nodeMajor };
+module.exports = { runInit, readExistingPort, haveTmux, nodeMajor, writeConfigAtomic };

package/lib/cli/pidfile.js

@@ -7,8 +7,8 @@ const os = require('node:os');
 const path = require('node:path');
 const { execFileSync } = require('node:child_process');
 
-function defaultPidfilePath() {
-  return process.env.NEXUSCREW_PIDFILE || path.join(os.homedir(), '.nexuscrew', 'nexuscrew.pid');
+function defaultPidfilePath(home = os.homedir()) {
+  return process.env.NEXUSCREW_PIDFILE || path.join(home, '.nexuscrew', 'nexuscrew.pid');
 }
 
 function readPidfile(p) {

package/lib/cli/service.js

@@ -70,7 +70,6 @@ After=network-online.target
 [Service]
 Type=simple
 WorkingDirectory=${repo}
-Environment=NEXUSCREW_PORT=${ctx.port}
 Environment=PATH=${nodeDir}:/usr/local/bin:/usr/bin:/bin
 ExecStart=${node} ${repoBin} serve
 Restart=on-failure
@@ -86,7 +85,6 @@ function generateMac(ctx) {
   const repoBinXml = escapeXml(path.join(ctx.repoRoot, 'bin', 'nexuscrew.js'));
   const repoXml = escapeXml(ctx.repoRoot);
   const homeXml = escapeXml(ctx.home);
-  const port = ctx.port;
   const launchPath = [...new Set([
     path.dirname(ctx.nodeBin), '/opt/homebrew/bin', '/usr/local/bin', '/usr/bin', '/bin',
   ])].join(':');
@@ -107,8 +105,6 @@ function generateMac(ctx) {
   <string>${repoXml}</string>
   <key>EnvironmentVariables</key>
   <dict>
-    <key>NEXUSCREW_PORT</key>
-    <string>${port}</string>
     <key>PATH</key>
     <string>${launchPathXml}</string>
   </dict>
@@ -136,7 +132,6 @@ function generateTermux(ctx) {
 # NexusCrew boot (Termux) - loopback, localhost del telefono
 export PATH=/data/data/com.termux/files/usr/bin:$PATH
 export HOME=/data/data/com.termux/files/home
-export NEXUSCREW_PORT=${ctx.port}
 cd -- ${repoQ}
 termux-wake-lock 2>/dev/null || true
 mkdir -p "$HOME/.nexuscrew"

package/lib/decks/store.js

@@ -8,7 +8,13 @@ const SCHEMA_VERSION = 1;
 const MAX_DECKS = 24;
 const MAX_TILES = 9;
 const NAME_RE = /^[a-z0-9-]{1,32}$/;
-const NODE_RE = /^[a-z0-9-]{1,32}$/;
+const NODE_RE = /^[a-z0-9-]{1,32}(?:\/[a-z0-9-]{1,32}){0,3}$/;
+
+function validNodeRoute(node) {
+  if (!NODE_RE.test(node)) return false;
+  const parts = node.split('/');
+  return new Set(parts).size === parts.length;
+}
 
 function defaultDecksPath(home) {
   return path.join(home || os.homedir(), '.nexuscrew', 'decks.json');
@@ -41,7 +47,7 @@ function parseLayout(raw) {
     const tiles = [];
     for (const t of c.tiles) {
       if (!t || typeof t !== 'object' || Array.isArray(t) || !validText(t.session, 128)) return null;
-      if (t.node !== undefined && (typeof t.node !== 'string' || !NODE_RE.test(t.node))) return null;
+      if (t.node !== undefined && (typeof t.node !== 'string' || !validNodeRoute(t.node))) return null;
       const height = Number(t.height);
       const fontSize = Number(t.fontSize);
       if (!Number.isFinite(height) || height < 0.2 || height > 100) return null;

package/lib/files/routes.js

@@ -9,7 +9,7 @@ const store = require('./store.js');
 
 // Router file-exchange. Nessuno stato: tutto deriva da cfg + filesystem.
 // notifier (opzionale, MCP bridge): emette la notify di consegna file outbox.
-function filesRoutes({ cfg, sessionExists, paste, notifier }) {
+function filesRoutes({ cfg, sessionExists, paste, notifier, readonly = () => false }) {
   const router = Router();
   const upload = multer({
     storage: multer.memoryStorage(),
@@ -17,6 +17,7 @@ function filesRoutes({ cfg, sessionExists, paste, notifier }) {
   });
 
   router.post('/upload', (req, res) => {
+    if (readonly()) return res.status(403).json({ error: 'READONLY: upload bloccato' });
     upload.single('file')(req, res, async (err) => {
       if (err) {
         const status = err.code === 'LIMIT_FILE_SIZE' ? 413 : 400;
@@ -104,6 +105,7 @@ function filesRoutes({ cfg, sessionExists, paste, notifier }) {
   });
 
   router.delete('/', (req, res) => {
+    if (readonly()) return res.status(403).json({ error: 'READONLY: eliminazione file bloccata' });
     const ok = store.removeFile(
       cfg.filesRoot, String(req.query.session || ''), String(req.query.box || ''), String(req.query.name || ''),
     );

package/lib/fleet/builtin.js

@@ -29,7 +29,7 @@ const {
   loadDefinitions, atomicWrite, CAPS,
 } = require('./definitions.js');
 const {
-  CATALOG: MANAGED_CATALOG, describeManaged, resolveManagedEngine, discoverOllamaModels,
+  publicCatalog, describeManaged, resolveManagedEngine, discoverOllamaModels, discoverPiModels,
 } = require('./managed.js');
 
 const STATUS_TTL_MS = 2000;
@@ -273,6 +273,8 @@ async function createBuiltinFleet(cfg = {}) {
     });
     const needsOllama = cache.defs.engines.some((e) => e.managed?.provider === 'ollama-cloud');
     const ollamaModels = needsOllama ? await discoverOllamaModels({ ...cfg, home }) : [];
+    const needsPi = cache.defs.engines.some((e) => e.managed?.client === 'pi');
+    const piModels = needsPi ? await discoverPiModels({ ...cfg, home }) : {};
     const engines = cache.defs.engines.map((e) => {
       const managed = e.managed ? describeManaged(e.managed, { ...cfg, home }) : null;
       return {
@@ -280,7 +282,8 @@ async function createBuiltinFleet(cfg = {}) {
         ...(managed ? {
           kind: 'managed', client: managed.client, provider: managed.provider,
           model: e.managed.model || managed.defaultModel || '',
-          models: managed.provider === 'ollama-cloud' ? ollamaModels : managed.models,
+          models: managed.provider === 'ollama-cloud' ? ollamaModels
+            : (managed.client === 'pi' ? (e.managed.provider === 'custom' ? [e.managed.model] : (piModels[e.managed.provider] || [])) : managed.models),
           configured: managed.configured, reason: managed.reason,
         } : { kind: 'custom', configured: true, model: e.model?.value || '', models: [] }),
       };
@@ -504,7 +507,7 @@ async function createBuiltinFleet(cfg = {}) {
         return out;
       }),
       cells: defs.cells.map((c) => ({ ...c, ...(c.models ? { models: { ...c.models } } : {}) })),
-      managedCatalog: MANAGED_CATALOG.map((p) => ({ ...p })),
+      managedCatalog: publicCatalog(),
       managedConfig: { providerSecretsPath: cfg.providerSecretsPath || path.join(home, '.nexuscrew', 'providers.env') },
     };
   }
@@ -536,9 +539,16 @@ async function createBuiltinFleet(cfg = {}) {
         rc: { type: 'boolean', required: false, default: false },
         managed: {
           type: 'object', requiredFor: 'managed',
-          client: { type: 'enum', values: ['claude', 'codex-vl'] },
-          provider: { type: 'enum', values: ['native', 'ollama-cloud', 'zai-a', 'zai-p'] },
+          client: { type: 'enum', values: ['claude', 'codex', 'codex-vl', 'pi'] },
+          provider: { type: 'catalog', source: 'managedCatalog' },
+          credentialProfile: { type: 'string', required: false, max: 32 },
           model: { type: 'string', required: false, max: CAPS.MAX_MODEL_VAL_LEN },
+          permissionPolicy: { type: 'enum', values: ['standard', 'unsafe'], default: 'standard' },
+          displayName: { type: 'string', requiredFor: 'provider=custom', max: CAPS.MAX_LABEL_LEN },
+          protocol: { type: 'catalog', source: 'managedCatalog.protocol' },
+          baseUrl: { type: 'string', requiredFor: 'provider=custom', max: CAPS.MAX_COMMAND_LEN },
+          envKey: { type: 'string', requiredFor: 'provider=custom', pattern: '^[A-Za-z_][A-Za-z0-9_]{0,63}$' },
+          providerId: { type: 'string', requiredFor: 'provider=custom', pattern: '^[a-z][a-z0-9_-]{0,31}$' },
         },
         command: { type: 'string', requiredFor: 'custom', max: CAPS.MAX_COMMAND_LEN, absolute: true },
         args: { type: 'array', of: 'string', required: false, max: CAPS.MAX_ARGS, itemMax: CAPS.MAX_ARG_LEN },