clavarium 0.1.4 → 0.1.5

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "clavarium",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "clavarium",
-      "version": "0.1.4",
+      "version": "0.1.5",
       "license": "MIT",
       "dependencies": {
         "@xterm/addon-fit": "^0.11.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clavarium",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "license": "MIT",
   "type": "module",
   "description": "A conversation is a VM with a terminal in it. Everything else is a folder.",

package/server/conversations.mjs

@@ -9,6 +9,7 @@
 import { isConversationName } from './names.mjs';
 import { attachCommand, SOCKET } from './tmux.mjs';
 import { WORK, VM_USER, SHARING_STEP } from './vm.mjs';
+import { resumeOrFresh } from './tools.mjs';
 
 export const SESSION = 'main';
 export const STOP_DELAY_MS = 60_000;
@@ -424,7 +425,7 @@ export class Conversations {
            first: added at EVERY start, a resume included (a tool does not
            keep it from its last session). */
         const rights = tool.rights ? (c.askFirst === true ? tool.rights.ask : tool.rights.full) : [];
-        return [...(resume ? tool.resume : tool.command), ...rights];
+        return resume ? resumeOrFresh([...tool.resume, ...rights], [...tool.command, ...rights]) : [...tool.command, ...rights];
     }
 
     /* Whether its tool asks before acting (true), or acts without asking in

package/server/tools.mjs

@@ -107,3 +107,16 @@ export function readTools(text) {
 export function loadTools(path = new URL('../config/tools.json', import.meta.url)) {
     return readTools(readFileSync(path, 'utf8'));
 }
+
+/* TAKING UP ITS LAST SESSION, OR A NEW ONE: a tool told to resume where it has
+   no session of its own (never spoken to, its session files gone) may just say
+   so and stop ("No conversation found"), leaving a dead terminal. If the resume
+   fails within RESUME_GRACE_S, the tool starts fresh, in the same terminal. A
+   tool that ran and is quit stays quit. One argument vector, for tmux. */
+export const RESUME_GRACE_S = 20;
+const shq = (a) => `'${String(a).replace(/'/g, `'\\''`)}'`;
+export function resumeOrFresh(resume, fresh) {
+    const script = `t=$(date +%s); ${resume.map(shq).join(' ')}; c=$?; `
+        + `if [ "$c" -ne 0 ] && [ $(( $(date +%s) - t )) -lt ${RESUME_GRACE_S} ]; then echo; echo 'No session to take up here: a new one starts.'; exec ${fresh.map(shq).join(' ')}; fi; exit "$c"`;
+    return ['sh', '-c', script];
+}