@staff0rd/assist 0.415.0 → 0.416.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.415.0",
+  version: "0.416.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -220,15 +220,38 @@ function mergeDenyRules(globalDeny, projectDeny) {
   const globalOnly = globalDeny.filter((r) => !projectPatterns.has(r.pattern));
   return [...globalOnly, ...projectDeny];
 }
+function runKey(r) {
+  return typeof r.name === "string" ? r.name : void 0;
+}
+function mergeRunConfigs(globalRun, projectRun) {
+  if (!globalRun && !projectRun) return void 0;
+  if (!globalRun) return projectRun;
+  if (!projectRun) return globalRun;
+  const projectNames = new Set(
+    projectRun.map(runKey).filter((n) => n !== void 0)
+  );
+  const globalOnly = globalRun.filter((r) => {
+    const key = runKey(r);
+    return key === void 0 || !projectNames.has(key);
+  });
+  return [...globalOnly, ...projectRun];
+}
 function mergeRawConfigs(globalRaw, projectRaw) {
   const deny = mergeDenyRules(
     globalRaw.deny,
     projectRaw.deny
   );
+  const run4 = mergeRunConfigs(
+    globalRaw.run,
+    projectRaw.run
+  );
   const merged = { ...globalRaw, ...projectRaw };
   if (deny !== void 0) {
     merged.deny = deny;
   }
+  if (run4 !== void 0) {
+    merged.run = run4;
+  }
   const globalSubtasks = globalRaw.subtasks;
   const projectSubtasks = projectRaw.subtasks;
   if (globalSubtasks || projectSubtasks) {
@@ -24810,7 +24833,6 @@ function toSessionInfo({
   cwd,
   restored,
   error,
-  errorOutput,
   activity: activity2,
   autoRun,
   autoAdvance,
@@ -24838,7 +24860,6 @@ function toSessionInfo({
     cwd,
     restored,
     error,
-    errorOutput,
     activity: activity2,
     autoRun,
     autoAdvance,
@@ -25497,26 +25518,6 @@ function makeStatusChangeHandler(dismiss, notify2, reuseForRun) {
   return (s, status3, exitCode) => applyStatusChange(s, status3, exitCode, dismiss, notify2, reuseForRun);
 }
 
-// src/commands/sessions/daemon/errorTail.ts
-var ESC3 = String.fromCharCode(27);
-var CSI = String.fromCharCode(155);
-var BEL = String.fromCharCode(7);
-var ANSI = new RegExp(
-  String.raw`[${ESC3}${CSI}][[\]()#;?]*(?:(?:[a-zA-Z\d]*(?:;[a-zA-Z\d]*)*)?${BEL}|(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-ntqry=><~])`,
-  "g"
-);
-var MAX_TAIL_LINES = 40;
-var MAX_TAIL_CHARS = 4e3;
-function stripAnsi(text17) {
-  return text17.replace(ANSI, "");
-}
-function errorTail(scrollback) {
-  const clean = stripAnsi(scrollback).replace(/\r\n?/g, "\n").replace(/[ \t]+\n/g, "\n").trimEnd();
-  if (clean.length === 0) return "";
-  const tail = clean.split("\n").slice(-MAX_TAIL_LINES).join("\n");
-  return tail.length > MAX_TAIL_CHARS ? tail.slice(-MAX_TAIL_CHARS) : tail;
-}
-
 // src/commands/sessions/daemon/handleFailedResume.ts
 function handleFailedResume(session, exitCode, onStatusChange) {
   const failed2 = session.restored === true && exitCode !== 0 && session.scrollback.length === 0;
@@ -25650,12 +25651,9 @@ function handlePtyExit(session, exitCode, onStatusChange) {
   if (handleFailedResume(session, exitCode, onStatusChange)) return;
   const priorStatus = session.status;
   if (exitCode !== 0) {
-    const tail = errorTail(session.scrollback);
     session.error = `process exited with code ${exitCode}`;
-    session.errorOutput = tail || void 0;
     daemonLog(
-      `session ${session.id} ("${session.name}") pty exited with code ${exitCode} from status "${priorStatus}" \u2014 unexpected exit, marking error; error output:
-${tail || "(no output captured)"}`
+      `session ${session.id} ("${session.name}") pty exited with code ${exitCode} from status "${priorStatus}" \u2014 unexpected exit, marking error`
     );
     onStatusChange(session, "error", exitCode);
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.415.0",
+	"version": "0.416.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {