@oharness/engine 0.10.0 → 0.11.0

package/dist/util/shell.js

@@ -1,3 +1,4 @@
+import { spawn } from "node:child_process";
 /**
  * `SHELL` is honoured on POSIX so a user on zsh/fish gets their own
  * environment; `ComSpec` is the Windows equivalent.
@@ -21,4 +22,73 @@ export function shellFor(script) {
 export function isWindowsShell() {
     return process.platform === "win32" && !/powershell|pwsh/i.test(process.env["ComSpec"] ?? "");
 }
+/**
+ * How long a shell that has exited is given for its output to finish
+ * arriving. The pipes normally close with it; when they do not, something it
+ * started is still holding them, and nothing that thing writes is output of
+ * the command any more.
+ */
+export const EXIT_GRACE_MS = 1_000;
+/**
+ * Start a shell that can be stopped along with everything it started.
+ *
+ * On POSIX it leads its own process group, so a kill reaches the `grep` or
+ * `find` it is running too. Killing only the shell left those behind,
+ * re-parented to init and still holding the output pipe, and the call waiting
+ * for that pipe to close waited forever. Not on Windows, where a detached
+ * child gets a console window of its own; the tree is killed by pid there.
+ */
+export function spawnShell(script, opts) {
+    const shell = shellFor(script);
+    return spawn(shell.command, shell.args, {
+        cwd: opts.cwd,
+        env: opts.env,
+        detached: process.platform !== "win32",
+        windowsHide: true,
+    });
+}
+/** Kill a shell from `spawnShell` and every process under it. */
+export function killShell(child) {
+    const pid = child.pid;
+    if (pid === undefined)
+        return;
+    if (process.platform === "win32") {
+        const killer = spawn("taskkill", ["/pid", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+        killer.on("error", () => child.kill("SIGKILL"));
+        return;
+    }
+    try {
+        process.kill(-pid, "SIGKILL");
+    }
+    catch {
+        // The group is gone already, or never formed: the shell alone, then.
+        child.kill("SIGKILL");
+    }
+}
+/**
+ * Call `done` once a shell's output is complete: when its pipes close, or
+ * `graceMs` after it exits if something it left running still holds them —
+ * `server &`, or a child that outlived a kill. Then the pipes are let go, so
+ * this side stops waiting on a process that is no longer the command.
+ */
+export function whenShellDone(child, done, graceMs = EXIT_GRACE_MS) {
+    let settled = false;
+    let grace;
+    const settle = (code) => {
+        if (settled)
+            return;
+        settled = true;
+        if (grace)
+            clearTimeout(grace);
+        done(code);
+    };
+    child.on("close", (code) => settle(code));
+    child.on("exit", (code) => {
+        grace = setTimeout(() => {
+            child.stdout.destroy();
+            child.stderr.destroy();
+            settle(code);
+        }, graceMs);
+    });
+}
 //# sourceMappingURL=shell.js.map

package/dist/util/shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/util/shell.ts"],"names":[],"mappings":"AAcA;;;GAGG;AACH,MAAM,UAAU,QAAQ,CAAC,MAAc;IACrC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC;QACpD,0EAA0E;QAC1E,+CAA+C;QAC/C,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACrC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC;QACxE,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;IAChE,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,uEAAuE;IACvE,iEAAiE;IACjE,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;AAC/F,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,cAAc;IAC5B,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;AAChG,CAAC"}
+{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/util/shell.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oharness/engine",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "The agent loop, tool execution, context management and permissions. No frontend, no transport.",
   "type": "module",
   "license": "MIT",
@@ -48,8 +48,8 @@
     "postpack": "node scripts/write-official.mjs --clean"
   },
   "dependencies": {
-    "@earendil-works/pi-ai": "^0.99.1",
-    "ottoport": "1.10.0",
+    "@earendil-works/pi-ai": "^1.1.0",
+    "ottoport": "1.13.0",
     "zod": "^4.1.5"
   }
 }

package/skills/media-generation/SKILL.md

@@ -5,7 +5,7 @@ description: Generate images, video, speech and music with the GenerateImage, Ge
 
 # Generating media
 
-Five tools, when the account has a media gateway configured:
+Five tools to make media, when the account has a media gateway configured:
 
 | Tool | For |
 | --- | --- |
@@ -94,3 +94,24 @@ and the first one is still running.
 Under `media/` by default, or wherever `path` says. Point `path` at the
 directory the work actually belongs in — an `assets/` folder, the directory of
 the page that will reference it — when that is obvious, and ask when it is not.
+
+## Keeping files online
+
+The workspace copy is the user's for good. The URL a generation returns
+lasts a few days. When the user wants results kept online — to use them from
+another device, or kept together as a campaign or a character — that is a
+**collection**, in their OHarness account (or the team's, when team credits
+are in use):
+
+| Tool | For |
+| --- | --- |
+| `ListMediaCollections` | Their collections, and how much of their allowance is used |
+| `CreateMediaCollection` | A new one — check the list first |
+| `ListSavedMedia` | What is kept, by collection and kind |
+| `SaveMedia` | Keep a result after the fact, from its URL, while it lasts |
+| `UploadMedia` | A local file as a URL models accept (a reference, a first frame), optionally kept |
+| `DeleteSavedMedia` | Remove a kept file, for good — only when asked |
+
+To keep a result as it is made, pass `collection` (an id or exact name) to the
+generate tool. Keeping is free within the allowance. Do not create collections
+or save files nobody asked to keep.