oft-agt 0.5.17 → 0.5.19

package/cli.mjs

@@ -18,7 +18,7 @@ import { acceptSecret } from './secret.mjs';
 import { createUsageCollector } from './usage.mjs';
 import { instanceDirectory, resolveInstance, listInstances, rememberInstance } from './instance.mjs';
 import { AGENT_VERSION } from './version.mjs';
-import { installOfficialUpdate } from './update.mjs';
+import { installOfficialUpdate, currentDirectory, newer } from './update.mjs';
 import { supervise } from './supervisor.mjs';
 
 const baseHome = process.env.OFTONE_AGENT_HOME || path.join(homedir(), '.oftone-agent');
@@ -233,6 +233,7 @@ function printHelp() {
   start | run           Démarrer en arrière-plan, sans ressaisir le token
   stop                  Arrêter l’agent et son bot, conserver la configuration
   restart               Redémarrer en arrière-plan
+  update | upgrade      Mettre à jour l’instance et redémarrer sans perdre sa configuration
   status                Afficher l’état local
   logs                  Lire les 100 dernières lignes du journal
   token [--stdin]       Régénérer l’authentification agent ; --stdin lit 64 caractères hexadécimaux
@@ -243,9 +244,16 @@ Options : --bot=IDENTIFIANT_COURT (voir list) pour choisir un bot ; start --fore
 Après un redémarrage du serveur : start. La configuration est conservée sur disque.
 Documentation : https://doc-builder.oftone.fr/agent`);
 }
+async function installSource(home, source) {
+  const install = path.join(home, 'installation');
+  await mkdir(install, { recursive: true, mode: 0o700 });
+  if (path.resolve(source) !== path.resolve(install)) for (const entry of ['cli.mjs', 'instance.mjs', 'version.mjs', 'release-key.mjs', 'update.mjs', 'supervisor.mjs', 'secret.mjs', 'usage.mjs', 'compiler.mjs', 'compile-plan.mjs', 'package.json', 'npm-shrinkwrap.json', 'runtime', 'templates']) await cp(path.join(source, entry), path.join(install, entry), { recursive: true });
+  await save(path.join(home, 'agent-release.json'), { directory: 'installation' });
+}
+
 async function main() {
   const [requestedCommand, ...args] = process.argv.slice(2);
-  const command = requestedCommand==='delete'?'remove':requestedCommand || 'login';
+  const command = requestedCommand==='delete'?'remove':requestedCommand==='update'?'upgrade':requestedCommand || 'login';
   const source = path.dirname(fileURLToPath(import.meta.url));
   if (['help', '--help', '-h'].includes(command)) { printHelp(); return; }
   if (command === 'list') { for (const instance of await listInstances(baseHome)) console.log(`${instance.agentId.slice(0, 8)} · ${(await localStatus(instance.home)).running ? 'actif' : 'arrêté'}`); return; }
@@ -302,22 +310,31 @@ async function main() {
   if (command === 'upgrade') {
     await stopBackground(home);
     const source = path.dirname(fileURLToPath(import.meta.url));
-    const install = path.join(home, 'installation');
-    await mkdir(install, { recursive: true, mode: 0o700 });
-    if (path.resolve(source) !== path.resolve(install)) for (const entry of ['cli.mjs', 'instance.mjs', 'version.mjs', 'release-key.mjs', 'update.mjs', 'supervisor.mjs', 'secret.mjs', 'usage.mjs', 'compiler.mjs', 'compile-plan.mjs', 'package.json', 'npm-shrinkwrap.json', 'runtime', 'templates']) await cp(path.join(source, entry), path.join(install, entry), { recursive: true });
-    await save(path.join(home, 'agent-release.json'), { directory: 'installation' });
+    await installSource(home, source);
     console.log('Agent mis à jour.');
     if (args.includes('--foreground')) { process.env.OFTONE_FOREGROUND = '1'; return supervise(home, source); }
     await startBackground(home, source); console.log('Agent démarré en arrière-plan.'); return;
   }
   if (['run', 'start', 'restart'].includes(command)) {
-    if (command === 'restart') await stopBackground(home);
+    const installed = await currentDirectory(home, source);
+    const installedVersion = JSON.parse(await readFile(path.join(installed, 'package.json'), 'utf8')).version;
+    const upgrading = newer(AGENT_VERSION, installedVersion);
+    if (command === 'restart' || upgrading) await stopBackground(home);
+    if (upgrading) { await installSource(home, source); console.log('Agent mis à jour vers ' + AGENT_VERSION + '.'); }
     await completeCredentialRotation(home, JSON.parse(await readFile(configPath, 'utf8')));
     if (args.includes('--foreground')) { process.env.OFTONE_FOREGROUND = '1'; return supervise(home, source); }
     await startBackground(home, source); console.log('Agent actif en arrière-plan. Aucun token à ressaisir.'); return;
   }
   if (command === 'stop') { await stopBackground(home); console.log('Agent arrêté. Sa configuration est conservée.'); return; }
-  if (command === 'status') { const state = await localStatus(home); console.log(state.legacy ? 'Agent actif au premier plan (ancienne installation).' : state.running ? 'Agent actif en arrière-plan.' : state.starting ? 'Agent en cours de démarrage.' : 'Agent arrêté.'); return; }
+  if (command === 'status') {
+    const state = await localStatus(home);
+    console.log(state.legacy ? 'Agent actif au premier plan (ancienne installation).' : state.running ? 'Agent actif en arrière-plan.' : state.starting ? 'Agent en cours de démarrage.' : 'Agent arrêté.');
+    const installed = await currentDirectory(home, source);
+    const version = JSON.parse(await readFile(path.join(installed, 'package.json'), 'utf8')).version;
+    console.log('Instance installée : ' + version + ' · CLI : ' + AGENT_VERSION);
+    if (newer(AGENT_VERSION, version)) console.log('Exécutez update pour appliquer la nouvelle version à cette instance.');
+    return;
+  }
   if (command === 'logs') { process.stdout.write(await readLogs(home)); return; }
   if (command === 'token') {
     const state = await localStatus(home); await stopBackground(home);

package/compile-plan.mjs

@@ -134,7 +134,7 @@ export function compile(input) {
 
       if (next.has(edge.source)) fail(`/${name}/${edge.source} : plusieurs sorties ne sont pas encore prises en charge. Reliez les actions en séquence.`);
 
-      if (incoming.has(edge.target)) fail(`/${name}/${edge.target} : plusieurs entrées ne sont pas prises en charge.`);
+
 
       next.set(edge.source, edge.target);
 
@@ -153,7 +153,9 @@ export function compile(input) {
     }
     const visited = new Set(options.map(option => option.id));
 
-    function compilePath(rootId, inheritedMessages = new Set(), inheritedWait = 0, depth = 0) {
+    let expanded = 0;
+    function compilePath(rootId, inheritedMessages = new Set(), inheritedWait = 0, depth = 0, ancestry = new Set()) {
+    const path = new Set(ancestry);
 
     if (depth > 32) fail(`/${name} : conditions imbriquées trop profondément (32 maximum).`);
 
@@ -167,7 +169,9 @@ export function compile(input) {
 
     while (current) {
 
-      if (visited.has(current)) fail(`/${name} : boucle détectée.`);
+      if (path.has(current)) fail(`/${name} : boucle détectée.`);
+      path.add(current);
+      if (++expanded > 10000) fail(`/${name} : parcours trop complexe (10 000 étapes maximum).`);
 
       visited.add(current);
 
@@ -185,7 +189,7 @@ export function compile(input) {
 
         const rules = conditionConfigs.get(current).rules;
 
-        calls.push({ id: current, fn: 'condition', args: { kind: block.type, rules }, branches: rules.map(rule => ({ id: branches.get(rule.id), ruleId: rule.id, calls: compilePath(branches.get(rule.id), emittedMessages, waitBudget, depth + 1) })), otherwise: { id: branches.get('else'), calls: compilePath(branches.get('else'), emittedMessages, waitBudget, depth + 1) } });
+        calls.push({ id: current, fn: 'condition', args: { kind: block.type, rules }, branches: rules.map(rule => ({ id: branches.get(rule.id), ruleId: rule.id, calls: compilePath(branches.get(rule.id), emittedMessages, waitBudget, depth + 1, path) })), otherwise: { id: branches.get('else'), calls: compilePath(branches.get('else'), emittedMessages, waitBudget, depth + 1, path) } });
 
       } else if (isVariableBlock(block.type)) {
         fn = block.type; args = validateVariableBlock(block.type, config, variableDefinitions);
@@ -203,7 +207,7 @@ export function compile(input) {
 
         const normal = normalizeMessageConfig(config);
 
-        if (!['reply', 'channel', 'dm'].includes(normal.sendMode)) fail(`/${name}/${current} : type d’envoi inconnu.`);
+        if (!['reply', 'channel', 'dm', 'edit'].includes(normal.sendMode)) fail(`/${name}/${current} : type d’envoi inconnu.`);
 
         if (config.sendMode && config.replyMode && !['command', 'block', 'message'].includes(config.replyMode)) fail(`/${name}/${current} : mode de réponse inconnu.`);
 
@@ -217,12 +221,13 @@ export function compile(input) {
 
         if (error) fail(`/${name}/${current} : ${error}`);
 
-        if (normal.sendMode === 'reply' && normal.replyMode === 'block' && !emittedMessages.has(normal.targetBlockId)) fail(`/${name}/${current} : le message cible doit être envoyé avant la réponse.`);
+        if ((normal.sendMode === 'edit' || normal.sendMode === 'reply' && normal.replyMode === 'block') && !emittedMessages.has(normal.targetBlockId)) fail(`/${name}/${current} : le message cible doit être envoyé avant la réponse.`);
 
         // Only accepted arguments are emitted; tokens and unrelated JSON properties are discarded.
 
         args = Object.fromEntries(['text', 'embeds', 'sendMode', 'replyMode', 'targetBlockId', 'messageId', 'channelMode', 'channelId', 'createdChannelBlockId', 'dmMode', 'userId', 'ephemeral'].map(key => [key, normal[key]]));
 
+        if (normal.sendMode === 'edit') args.keepButtons = normal.keepButtons;
         args.embeds = normal.embeds.map(embed => ({
 
           ...Object.fromEntries(['title', 'description', 'url', 'color', 'timestamp'].filter(key => embed[key] !== undefined).map(key => [key, embed[key]])),
@@ -246,8 +251,8 @@ export function compile(input) {
         if(children.length) args.buttons=children.map(child=>({id:child.id,config:validateButton(child.config)}));
         for(const child of children){
           const config=validateButton(child.config);
-          const childCalls=compilePath(child.id,emittedMessages,0,depth+1);
-          buttonBranches.push({id:child.id,parentId:current,config,calls:childCalls});
+          const childCalls=compilePath(child.id,emittedMessages,0,depth+1,path);
+          if (!buttonBranches.some(branch => branch.id === child.id)) buttonBranches.push({id:child.id,parentId:current,config,calls:childCalls});
         }
 
       } else if (block.type === 'apiRequest') { fn='apiRequest'; args=validateApiRequest(config); if([...blocks.values()].some(b=>b.id!==block.id&&b.type==='apiRequest'&&b.config?.name===args.name))fail('Chaque requête API doit avoir un nom unique.');

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "oft-agt",
-  "version": "0.5.17",
+  "version": "0.5.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "oft-agt",
-      "version": "0.5.17",
+      "version": "0.5.19",
       "license": "UNLICENSED",
       "dependencies": {
         "discord.js": "^14.14.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oft-agt",
-  "version": "0.5.17",
+  "version": "0.5.19",
   "private": false,
   "type": "module",
   "engines": {

package/runtime/execute.mjs

@@ -60,7 +60,7 @@ async function executeAdmitted(command, interaction, client, options) {
 
     for (const call of calls) {
 
-      if (++count > 500) throw new Error('Plan d’exécution trop volumineux.');
+      if (++count > 10000) throw new Error('Plan d’exécution trop volumineux.');
 
       if (call.fn === 'condition') {
 
@@ -135,7 +135,7 @@ async function executeAdmitted(command, interaction, client, options) {
     context.signal.throwIfAborted();
 
     const args=await (call.fn==='apiRequest'?interpolateApiArguments:interpolateVariables)(call.args,context.variableOptions);
-    const prepared=call.fn==='sendMessage'&&args.buttons?.length?(options.buttonRouter||buttonRouter).prepare(command,args.buttons,context,optionValues):null;
+    const prepared=call.fn==='sendMessage'&&!(args.sendMode==='edit'&&args.keepButtons!==false)&&args.buttons?.length?(options.buttonRouter||buttonRouter).prepare(command,args.buttons,context,optionValues):null;
     const invoke=async()=>{try{return await registry[call.fn](context,{...args,...(prepared?{components:prepared.components}:{})});}catch(error){prepared?.cancel();throw error;}};
 
     let result;try{result=call.fn==='wait'?await invoke():await options.scheduler.run(invoke,{signal:context.signal});}catch(error){prepared?.cancel();throw error;}
@@ -162,7 +162,7 @@ async function executeAdmitted(command, interaction, client, options) {
       context.signal.throwIfAborted();
 
       const args=interpolateError(await (call.fn==='apiRequest'?interpolateApiArguments:interpolateVariables)(call.args,{...context.variableOptions,base:{...context.variableOptions.base,...optionValues,...variables}}),variables);
-    const prepared=call.fn==='sendMessage'&&args.buttons?.length?(options.buttonRouter||buttonRouter).prepare(command,args.buttons,context,{...optionValues,...variables}):null;
+    const prepared=call.fn==='sendMessage'&&!(args.sendMode==='edit'&&args.keepButtons!==false)&&args.buttons?.length?(options.buttonRouter||buttonRouter).prepare(command,args.buttons,context,{...optionValues,...variables}):null;
     const invoke=async()=>{try{return await registry[call.fn](context,{...args,...(prepared?{components:prepared.components}:{})});}catch(error){prepared?.cancel();throw error;}};
 
       let result;try{result=call.fn==='wait'?await invoke():await options.scheduler.run(invoke,{signal:context.signal});}catch(error){prepared?.cancel();throw error;}

package/runtime/functions.mjs

@@ -63,6 +63,14 @@ async function sendMessage(context, parameters) {
 
   const { interaction, client, messages } = context;
 
+  if (config.sendMode === 'edit') {
+    const message = messages.get(config.targetBlockId);
+    if (!message?.edit || !client.user?.id || message.author?.id !== client.user.id) throw runtimeError('MESSAGE_NOT_FOUND');
+    const editedPayload = { ...payload, content: config.text };
+    if (config.keepButtons) delete editedPayload.components;
+    else editedPayload.components = parameters.components || [];
+    return message.edit(editedPayload);
+  }
   if (interaction.eventTrigger && config.ephemeral) throw runtimeError('MESSAGE_INVALID');
   if (interaction.eventTrigger && config.sendMode === 'reply' && config.replyMode === 'command') {
     if (interaction.eventTrigger !== 'messageCreate' || !interaction.eventMessage?.reply) throw runtimeError('MESSAGE_NOT_FOUND');

package/runtime/message-config.mjs

@@ -29,6 +29,7 @@ export function normalizeMessageConfig(config = {}) {
     userId: config.userId || '',
 
     ephemeral: Boolean(config.ephemeral),
+    keepButtons: config.keepButtons !== false,
 
   };
 
@@ -96,7 +97,7 @@ export function messageConfigError(raw, nodes, allowVariables = true) {
 
   if (total > 6000) return 'L’ensemble des embeds est limité à 6 000 caractères.';
 
-  if (config.sendMode === 'reply' && config.replyMode === 'block' && (!config.targetBlockId || (nodes && !nodes.some(node => (node.id === config.targetBlockId && (node.type === 'sendMessage' || node.data?.kind === 'message')))))) return 'Choisissez un bloc de message existant.';
+  if ((config.sendMode === 'edit' || config.sendMode === 'reply' && config.replyMode === 'block') && (!config.targetBlockId || (nodes && !nodes.some(node => (node.id === config.targetBlockId && (node.type === 'sendMessage' || node.data?.kind === 'message')))))) return 'Choisissez un bloc de message existant.';
 
   if (config.sendMode === 'channel' && config.channelMode === 'created' && (!config.createdChannelBlockId || (nodes && !nodes.some(n=>n.id===config.createdChannelBlockId && (n.type==='createChannel'||n.data?.kind==='createChannel'))))) return 'Choisissez un bloc de création de salon.';
 

package/runtime/version.mjs

@@ -1 +1 @@
-export const RUNTIME_VERSION = '0.5.17';
+export const RUNTIME_VERSION = '0.5.19';

package/update.mjs

@@ -1,6 +1,6 @@
 import { createHash, verify } from 'node:crypto';
 import { gunzipSync } from 'node:zlib';
-import { readFile, writeFile, mkdir, rename, access, symlink } from 'node:fs/promises';
+import { readFile, writeFile, mkdir, rename, access, symlink, realpath } from 'node:fs/promises';
 import { spawn } from 'node:child_process';
 import path from 'node:path';
 import { RELEASE_PUBLIC_KEY } from './release-key.mjs';
@@ -80,6 +80,16 @@ function run(args, cwd) {
     child.once('exit', code => { clearTimeout(timer); code === 0 ? resolve() : reject(new Error('UPDATE_CHECK')); });
   });
 }
+// Package version changes do not change the installed dependency tree.
+export function sameDependencies(a, b) {
+  const normalize = bytes => { const lock = JSON.parse(bytes.toString()); delete lock.version; if (lock.packages?.['']) delete lock.packages[''].version; return lock; };
+  return JSON.stringify(normalize(a)) === JSON.stringify(normalize(b));
+}
+export async function findNpmCli() {
+  const candidates = [process.env.npm_execpath, path.join(path.dirname(process.execPath), 'node_modules/npm/bin/npm-cli.js'), ...String(process.env.PATH || '').split(path.delimiter).map(dir => path.join(dir, 'npm'))].filter(Boolean);
+  for (const candidate of candidates) { try { const resolved = await realpath(candidate); if (path.basename(resolved) === 'npm-cli.js') return resolved; } catch {} }
+  throw new Error('UPDATE_DEPENDENCIES');
+}
 export async function installUpdate(release, { home, currentVersion, source, report = () => {}, fetchRelease = fetch, publicKey = RELEASE_PUBLIC_KEY, prepareDependencies, check } = {}) {
   const url = validateRelease(release, currentVersion, publicKey);
   report('downloading');
@@ -99,12 +109,10 @@ export async function installUpdate(release, { home, currentVersion, source, rep
   if (prepareDependencies) await prepareDependencies(destination);
   else {
     const oldLock = await readFile(path.join(source, 'npm-shrinkwrap.json'));
-    if (oldLock.equals(entries.get('npm-shrinkwrap.json'))) {
+    if (sameDependencies(oldLock, entries.get('npm-shrinkwrap.json'))) {
       try { await access(path.join(destination, 'node_modules')); } catch { await symlink(path.join(source, 'node_modules'), path.join(destination, 'node_modules'), process.platform === 'win32' ? 'junction' : 'dir'); }
     } else {
-      const npm = process.env.npm_execpath || path.join(path.dirname(process.execPath), 'node_modules/npm/bin/npm-cli.js');
-      if (path.basename(npm) !== 'npm-cli.js') throw new Error('UPDATE_DEPENDENCIES');
-      await access(npm);
+      const npm = await findNpmCli();
       await run([npm, 'ci', '--omit=dev', '--ignore-scripts', '--no-audit', '--no-fund', '--registry=https://registry.npmjs.org'], destination);
     }
   }

package/version.mjs

@@ -1 +1 @@
-export const AGENT_VERSION = '0.5.17';
+export const AGENT_VERSION = '0.5.19';