spawn-term 1.1.6 → 1.1.8

package/dist/cjs/components/App.js

@@ -10,17 +10,31 @@ Object.defineProperty(exports, "default", {
 });
 var _jsxruntime = require("react/jsx-runtime");
 var _ink = require("ink");
+var _react = require("react");
+var _processStorets = require("../state/processStore.js");
 var _ChildProcessts = /*#__PURE__*/ _interop_require_default(require("./ChildProcess.js"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function App(param) {
-    var store = param.store;
+function App() {
+    var exit = (0, _ink.useApp)().exit;
+    // Subscribe to process state
+    var processes = (0, _react.useSyncExternalStore)(_processStorets.processStore.subscribe, _processStorets.processStore.getSnapshot);
+    // Handle exit signal
+    var shouldExit = (0, _react.useSyncExternalStore)(_processStorets.processStore.subscribe, _processStorets.processStore.getShouldExit);
+    (0, _react.useEffect)(function() {
+        if (shouldExit) {
+            exit();
+        }
+    }, [
+        shouldExit,
+        exit
+    ]);
     return /*#__PURE__*/ (0, _jsxruntime.jsx)(_ink.Box, {
         flexDirection: "column",
-        children: store.processes.map(function(item) {
+        children: processes.map(function(item) {
             return /*#__PURE__*/ (0, _jsxruntime.jsx)(_ChildProcessts.default, {
                 item: item
             }, item.id);

package/dist/cjs/components/App.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/components/App.tsx"],"sourcesContent":["import { Box } from 'ink';\nimport type Store from '../state/Store.ts';\nimport type { ChildProcess as ChildProcessT } from '../types.ts';\nimport ChildProcess from './ChildProcess.ts';\n\nexport interface AppProps {\n  store: Store;\n}\n\nexport default function App({ store }: AppProps): React.JSX.Element {\n  return (\n    <Box flexDirection=\"column\">\n      {store.processes.map((item: ChildProcessT) => (\n        <ChildProcess key={item.id} item={item} />\n      ))}\n    </Box>\n  );\n}\n"],"names":["App","store","Box","flexDirection","processes","map","item","ChildProcess","id"],"mappings":";;;;+BASA;;;eAAwBA;;;;mBATJ;qEAGK;;;;;;AAMV,SAASA,IAAI,KAAmB;QAAnB,AAAEC,QAAF,MAAEA;IAC5B,qBACE,qBAACC,QAAG;QAACC,eAAc;kBAChBF,MAAMG,SAAS,CAACC,GAAG,CAAC,SAACC;iCACpB,qBAACC,uBAAY;gBAAeD,MAAMA;eAAfA,KAAKE,EAAE;;;AAIlC"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/components/App.tsx"],"sourcesContent":["import { Box, useApp } from 'ink';\nimport { useEffect, useSyncExternalStore } from 'react';\nimport { processStore } from '../state/processStore.ts';\nimport type { ChildProcess as ChildProcessT } from '../types.ts';\nimport ChildProcess from './ChildProcess.ts';\n\nexport default function App(): React.JSX.Element {\n  const { exit } = useApp();\n\n  // Subscribe to process state\n  const processes = useSyncExternalStore(processStore.subscribe, processStore.getSnapshot);\n\n  // Handle exit signal\n  const shouldExit = useSyncExternalStore(processStore.subscribe, processStore.getShouldExit);\n\n  useEffect(() => {\n    if (shouldExit) {\n      exit();\n    }\n  }, [shouldExit, exit]);\n\n  return (\n    <Box flexDirection=\"column\">\n      {processes.map((item: ChildProcessT) => (\n        <ChildProcess key={item.id} item={item} />\n      ))}\n    </Box>\n  );\n}\n"],"names":["App","exit","useApp","processes","useSyncExternalStore","processStore","subscribe","getSnapshot","shouldExit","getShouldExit","useEffect","Box","flexDirection","map","item","ChildProcess","id"],"mappings":";;;;+BAMA;;;eAAwBA;;;;mBANI;qBACoB;8BACnB;qEAEJ;;;;;;AAEV,SAASA;IACtB,IAAM,AAAEC,OAASC,IAAAA,WAAM,IAAfD;IAER,6BAA6B;IAC7B,IAAME,YAAYC,IAAAA,2BAAoB,EAACC,4BAAY,CAACC,SAAS,EAAED,4BAAY,CAACE,WAAW;IAEvF,qBAAqB;IACrB,IAAMC,aAAaJ,IAAAA,2BAAoB,EAACC,4BAAY,CAACC,SAAS,EAAED,4BAAY,CAACI,aAAa;IAE1FC,IAAAA,gBAAS,EAAC;QACR,IAAIF,YAAY;YACdP;QACF;IACF,GAAG;QAACO;QAAYP;KAAK;IAErB,qBACE,qBAACU,QAAG;QAACC,eAAc;kBAChBT,UAAUU,GAAG,CAAC,SAACC;iCACd,qBAACC,uBAAY;gBAAeD,MAAMA;eAAfA,KAAKE,EAAE;;;AAIlC"}

package/dist/cjs/createApp.js

@@ -10,52 +10,44 @@ Object.defineProperty(exports, "default", {
 });
 var _jsxruntime = require("react/jsx-runtime");
 var _ink = require("ink");
-var _lodashthrottle = /*#__PURE__*/ _interop_require_default(require("lodash.throttle"));
 var _Appts = /*#__PURE__*/ _interop_require_default(require("./components/App.js"));
-var _Storets = /*#__PURE__*/ _interop_require_default(require("./state/Store.js"));
+var _processStorets = require("./state/processStore.js");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-var THROTTLE = 100;
 function createApp() {
     var refCount = 0;
-    var store = null;
     var inkApp = null;
-    var previousData = null;
-    var rerender = (0, _lodashthrottle.default)(function() {
-        if (!inkApp || !store) return;
-        if (store.data() === previousData) return;
-        previousData = store.data();
-        inkApp.rerender(/*#__PURE__*/ (0, _jsxruntime.jsx)(_Appts.default, {
-            store: store
-        }));
-    }, THROTTLE, {
-        leading: false
-    });
     return {
-        retain: function retain(fn) {
-            if (++refCount > 1) return fn(store);
-            if (store) throw new Error('Not expecting store');
-            store = new _Storets.default(rerender);
-            inkApp = (0, _ink.render)(/*#__PURE__*/ (0, _jsxruntime.jsx)(_Appts.default, {
-                store: store
-            }));
-            fn(store);
+        retain: function retain() {
+            if (++refCount > 1) return _processStorets.processStore;
+            // Render once - React handles all subsequent updates via useSyncExternalStore
+            inkApp = (0, _ink.render)(/*#__PURE__*/ (0, _jsxruntime.jsx)(_Appts.default, {}));
+            return _processStorets.processStore;
         },
-        release: function release(cb) {
-            if (--refCount > 0) return cb();
-            if (!store) throw new Error('Expecting store');
-            rerender.flush();
-            rerender.cancel();
+        release: function release(callback) {
+            if (--refCount > 0) {
+                callback();
+                return;
+            }
+            if (!inkApp) throw new Error('Expecting inkApp');
+            // Signal exit to React component, provide callback for after cleanup
+            _processStorets.processStore.signalExit(function() {
+                _processStorets.processStore.reset();
+                process.stdout.write('\x1b[?25h'); // show cursor
+                callback();
+            });
+            // Wait for Ink to finish, then call the callback
             inkApp.waitUntilExit().then(function() {
-                return cb();
-            }).catch(cb);
-            inkApp.unmount();
+                var cb = _processStorets.processStore.getExitCallback();
+                cb === null || cb === void 0 ? void 0 : cb();
+            }).catch(function() {
+                var cb = _processStorets.processStore.getExitCallback();
+                cb === null || cb === void 0 ? void 0 : cb();
+            });
             inkApp = null;
-            store = null;
-            process.stdout.write('\x1b[?25h'); // show cursor
         }
     };
 }

package/dist/cjs/createApp.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/createApp.tsx"],"sourcesContent":["import { type Instance, render } from 'ink';\nimport throttle from 'lodash.throttle';\nimport App from './components/App.ts';\nimport { default as Store, type StoreData } from './state/Store.ts';\n\nexport type RetainCallback = (app: Store) => undefined;\nexport type ReleaseCallback = () => undefined;\n\nconst THROTTLE = 100;\n\nexport default function createApp() {\n  let refCount = 0;\n  let store = null;\n  let inkApp: Instance | null = null;\n\n  let previousData: StoreData[] = null;\n  const rerender = throttle(\n    () => {\n      if (!inkApp || !store) return;\n      if (store.data() === previousData) return;\n      previousData = store.data();\n      inkApp.rerender(<App store={store} />);\n    },\n    THROTTLE,\n    { leading: false }\n  );\n\n  return {\n    retain(fn: RetainCallback): undefined {\n      if (++refCount > 1) return fn(store);\n      if (store) throw new Error('Not expecting store');\n\n      store = new Store(rerender);\n      inkApp = render(<App store={store} />);\n      fn(store);\n    },\n    release(cb: ReleaseCallback): undefined {\n      if (--refCount > 0) return cb();\n      if (!store) throw new Error('Expecting store');\n\n      rerender.flush();\n      rerender.cancel();\n      inkApp\n        .waitUntilExit()\n        .then(() => cb())\n        .catch(cb);\n      inkApp.unmount();\n      inkApp = null;\n      store = null;\n      process.stdout.write('\\x1b[?25h'); // show cursor\n    },\n  };\n}\n"],"names":["createApp","THROTTLE","refCount","store","inkApp","previousData","rerender","throttle","data","App","leading","retain","fn","Error","Store","render","release","cb","flush","cancel","waitUntilExit","then","catch","unmount","process","stdout","write"],"mappings":";;;;+BAUA;;;eAAwBA;;;;mBAVc;qEACjB;4DACL;8DACiC;;;;;;AAKjD,IAAMC,WAAW;AAEF,SAASD;IACtB,IAAIE,WAAW;IACf,IAAIC,QAAQ;IACZ,IAAIC,SAA0B;IAE9B,IAAIC,eAA4B;IAChC,IAAMC,WAAWC,IAAAA,uBAAQ,EACvB;QACE,IAAI,CAACH,UAAU,CAACD,OAAO;QACvB,IAAIA,MAAMK,IAAI,OAAOH,cAAc;QACnCA,eAAeF,MAAMK,IAAI;QACzBJ,OAAOE,QAAQ,eAAC,qBAACG,cAAG;YAACN,OAAOA;;IAC9B,GACAF,UACA;QAAES,SAAS;IAAM;IAGnB,OAAO;QACLC,QAAAA,SAAAA,OAAOC,EAAkB;YACvB,IAAI,EAAEV,WAAW,GAAG,OAAOU,GAAGT;YAC9B,IAAIA,OAAO,MAAM,IAAIU,MAAM;YAE3BV,QAAQ,IAAIW,gBAAK,CAACR;YAClBF,SAASW,IAAAA,WAAM,gBAAC,qBAACN,cAAG;gBAACN,OAAOA;;YAC5BS,GAAGT;QACL;QACAa,SAAAA,SAAAA,QAAQC,EAAmB;YACzB,IAAI,EAAEf,WAAW,GAAG,OAAOe;YAC3B,IAAI,CAACd,OAAO,MAAM,IAAIU,MAAM;YAE5BP,SAASY,KAAK;YACdZ,SAASa,MAAM;YACff,OACGgB,aAAa,GACbC,IAAI,CAAC;uBAAMJ;eACXK,KAAK,CAACL;YACTb,OAAOmB,OAAO;YACdnB,SAAS;YACTD,QAAQ;YACRqB,QAAQC,MAAM,CAACC,KAAK,CAAC,cAAc,cAAc;QACnD;IACF;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/createApp.tsx"],"sourcesContent":["import { render } from 'ink';\nimport App from './components/App.ts';\nimport { type ProcessStore, processStore } from './state/processStore.ts';\n\nexport type ReleaseCallback = () => void;\n\nexport default function createApp() {\n  let refCount = 0;\n  let inkApp: ReturnType<typeof render> | null = null;\n\n  return {\n    retain(): ProcessStore {\n      if (++refCount > 1) return processStore;\n\n      // Render once - React handles all subsequent updates via useSyncExternalStore\n      inkApp = render(<App />);\n      return processStore;\n    },\n\n    release(callback: ReleaseCallback): void {\n      if (--refCount > 0) {\n        callback();\n        return;\n      }\n      if (!inkApp) throw new Error('Expecting inkApp');\n\n      // Signal exit to React component, provide callback for after cleanup\n      processStore.signalExit(() => {\n        processStore.reset();\n        process.stdout.write('\\x1b[?25h'); // show cursor\n        callback();\n      });\n\n      // Wait for Ink to finish, then call the callback\n      inkApp\n        .waitUntilExit()\n        .then(() => {\n          const cb = processStore.getExitCallback();\n          cb?.();\n        })\n        .catch(() => {\n          const cb = processStore.getExitCallback();\n          cb?.();\n        });\n\n      inkApp = null;\n    },\n  };\n}\n"],"names":["createApp","refCount","inkApp","retain","processStore","render","App","release","callback","Error","signalExit","reset","process","stdout","write","waitUntilExit","then","cb","getExitCallback","catch"],"mappings":";;;;+BAMA;;;eAAwBA;;;;mBAND;4DACP;8BACgC;;;;;;AAIjC,SAASA;IACtB,IAAIC,WAAW;IACf,IAAIC,SAA2C;IAE/C,OAAO;QACLC,QAAAA,SAAAA;YACE,IAAI,EAAEF,WAAW,GAAG,OAAOG,4BAAY;YAEvC,8EAA8E;YAC9EF,SAASG,IAAAA,WAAM,gBAAC,qBAACC,cAAG;YACpB,OAAOF,4BAAY;QACrB;QAEAG,SAAAA,SAAAA,QAAQC,QAAyB;YAC/B,IAAI,EAAEP,WAAW,GAAG;gBAClBO;gBACA;YACF;YACA,IAAI,CAACN,QAAQ,MAAM,IAAIO,MAAM;YAE7B,qEAAqE;YACrEL,4BAAY,CAACM,UAAU,CAAC;gBACtBN,4BAAY,CAACO,KAAK;gBAClBC,QAAQC,MAAM,CAACC,KAAK,CAAC,cAAc,cAAc;gBACjDN;YACF;YAEA,iDAAiD;YACjDN,OACGa,aAAa,GACbC,IAAI,CAAC;gBACJ,IAAMC,KAAKb,4BAAY,CAACc,eAAe;gBACvCD,eAAAA,yBAAAA;YACF,GACCE,KAAK,CAAC;gBACL,IAAMF,KAAKb,4BAAY,CAACc,eAAe;gBACvCD,eAAAA,yBAAAA;YACF;YAEFf,SAAS;QACX;IACF;AACF"}

package/dist/cjs/index-esm.js

@@ -42,5 +42,5 @@ function _interop_require_default(obj) {
     };
 }
 var major = +process.versions.node.split('.')[0];
-var _default = major > 14 ? _spawnTerminalts.default : undefined;
+var _default = major > 18 ? _spawnTerminalts.default : undefined;
 /* CJS INTEROP */ if (exports.__esModule && exports.default) { try { Object.defineProperty(exports.default, '__esModule', { value: true }); for (var key in exports) { exports.default[key] = exports[key]; } } catch (_) {}; module.exports = exports.default; }

package/dist/cjs/index-esm.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/index-esm.ts"],"sourcesContent":["export { default as figures } from './lib/figures.ts';\nexport { default as formatArguments } from './lib/formatArguments.ts';\nexport * from './types.ts';\n\nconst major = +process.versions.node.split('.')[0];\n\nimport { default as spawnTerminal } from './spawnTerminal.ts';\nexport default major > 14 ? spawnTerminal : (undefined as typeof spawnTerminal);\n"],"names":["figures","formatArguments","major","process","versions","node","split","spawnTerminal","undefined"],"mappings":";;;;;;;;;;;QAOA;eAAA;;QAPoBA;eAAAA,kBAAO;;QACPC;eAAAA,0BAAe;;;gEADA;wEACQ;qBAC7B;sEAI2B;;;;;;;;;;;;;;;;;;;AAFzC,IAAMC,QAAQ,CAACC,QAAQC,QAAQ,CAACC,IAAI,CAACC,KAAK,CAAC,IAAI,CAAC,EAAE;IAGlD,WAAeJ,QAAQ,KAAKK,wBAAa,GAAIC"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/index-esm.ts"],"sourcesContent":["export { default as figures } from './lib/figures.ts';\nexport { default as formatArguments } from './lib/formatArguments.ts';\nexport * from './types.ts';\n\nconst major = +process.versions.node.split('.')[0];\n\nimport { default as spawnTerminal } from './spawnTerminal.ts';\nexport default major > 18 ? spawnTerminal : (undefined as typeof spawnTerminal);\n"],"names":["figures","formatArguments","major","process","versions","node","split","spawnTerminal","undefined"],"mappings":";;;;;;;;;;;QAOA;eAAA;;QAPoBA;eAAAA,kBAAO;;QACPC;eAAAA,0BAAe;;;gEADA;wEACQ;qBAC7B;sEAI2B;;;;;;;;;;;;;;;;;;;AAFzC,IAAMC,QAAQ,CAACC,QAAQC,QAAQ,CAACC,IAAI,CAACC,KAAK,CAAC,IAAI,CAAC,EAAE;IAGlD,WAAeJ,QAAQ,KAAKK,wBAAa,GAAIC"}

package/dist/cjs/lib/figures.js

@@ -1,4 +1,3 @@
-// From: https://github.com/sindresorhus/is-unicode-supported
 "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
@@ -9,6 +8,7 @@ Object.defineProperty(exports, "default", {
         return _default;
     }
 });
+// From: https://github.com/sindresorhus/is-unicode-supported
 function isUnicodeSupported() {
     var env = process.env;
     var TERM = env.TERM, TERM_PROGRAM = env.TERM_PROGRAM;

package/dist/cjs/lib/figures.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/figures.ts"],"sourcesContent":["// From: https://github.com/sindresorhus/is-unicode-supported\nfunction isUnicodeSupported() {\n  const { env } = process;\n  const { TERM, TERM_PROGRAM } = env;\n\n  if (process.platform !== 'win32') {\n    return TERM !== 'linux'; // Linux console (kernel)\n  }\n\n  return (\n    Boolean(env.WT_SESSION) || // Windows Terminal\n    Boolean(env.TERMINUS_SUBLIME) || // Terminus (<0.2.27)\n    env.ConEmuTask === '{cmd::Cmder}' || // ConEmu and cmder\n    TERM_PROGRAM === 'Terminus-Sublime' ||\n    TERM_PROGRAM === 'vscode' ||\n    TERM === 'xterm-256color' ||\n    TERM === 'alacritty' ||\n    TERM === 'rxvt-unicode' ||\n    TERM === 'rxvt-unicode-256color' ||\n    env.TERMINAL_EMULATOR === 'JetBrains-JediTerm'\n  );\n}\n\n// From https://github.com/sindresorhus/figures\nconst symbols = {\n  arrowRight: '→',\n  tick: '✔',\n  info: 'ℹ',\n  warning: '⚠',\n  cross: '✖',\n  squareSmallFilled: '◼',\n  pointer: '❯',\n};\n\nconst fallbackSymbols = {\n  arrowRight: '→',\n  tick: '√',\n  info: 'i',\n  warning: '‼',\n  cross: '×',\n  squareSmallFilled: '■',\n  pointer: '>',\n};\n\nexport default isUnicodeSupported() ? symbols : fallbackSymbols;\n"],"names":["isUnicodeSupported","env","process","TERM","TERM_PROGRAM","platform","Boolean","WT_SESSION","TERMINUS_SUBLIME","ConEmuTask","TERMINAL_EMULATOR","symbols","arrowRight","tick","info","warning","cross","squareSmallFilled","pointer","fallbackSymbols"],"mappings":"AAAA,6DAA6D;;;;;+BA4C7D;;;eAAA;;;AA3CA,SAASA;IACP,IAAM,AAAEC,MAAQC,QAARD;IACR,IAAQE,OAAuBF,IAAvBE,MAAMC,eAAiBH,IAAjBG;IAEd,IAAIF,QAAQG,QAAQ,KAAK,SAAS;QAChC,OAAOF,SAAS,SAAS,yBAAyB;IACpD;IAEA,OACEG,QAAQL,IAAIM,UAAU,KAAK,mBAAmB;IAC9CD,QAAQL,IAAIO,gBAAgB,KAAK,qBAAqB;IACtDP,IAAIQ,UAAU,KAAK,kBAAkB,mBAAmB;IACxDL,iBAAiB,sBACjBA,iBAAiB,YACjBD,SAAS,oBACTA,SAAS,eACTA,SAAS,kBACTA,SAAS,2BACTF,IAAIS,iBAAiB,KAAK;AAE9B;AAEA,+CAA+C;AAC/C,IAAMC,UAAU;IACdC,YAAY;IACZC,MAAM;IACNC,MAAM;IACNC,SAAS;IACTC,OAAO;IACPC,mBAAmB;IACnBC,SAAS;AACX;AAEA,IAAMC,kBAAkB;IACtBP,YAAY;IACZC,MAAM;IACNC,MAAM;IACNC,SAAS;IACTC,OAAO;IACPC,mBAAmB;IACnBC,SAAS;AACX;IAEA,WAAelB,uBAAuBW,UAAUQ"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/figures.ts"],"sourcesContent":["// From: https://github.com/sindresorhus/is-unicode-supported\nfunction isUnicodeSupported() {\n  const { env } = process;\n  const { TERM, TERM_PROGRAM } = env;\n\n  if (process.platform !== 'win32') {\n    return TERM !== 'linux'; // Linux console (kernel)\n  }\n\n  return (\n    Boolean(env.WT_SESSION) || // Windows Terminal\n    Boolean(env.TERMINUS_SUBLIME) || // Terminus (<0.2.27)\n    env.ConEmuTask === '{cmd::Cmder}' || // ConEmu and cmder\n    TERM_PROGRAM === 'Terminus-Sublime' ||\n    TERM_PROGRAM === 'vscode' ||\n    TERM === 'xterm-256color' ||\n    TERM === 'alacritty' ||\n    TERM === 'rxvt-unicode' ||\n    TERM === 'rxvt-unicode-256color' ||\n    env.TERMINAL_EMULATOR === 'JetBrains-JediTerm'\n  );\n}\n\n// From https://github.com/sindresorhus/figures\nconst symbols = {\n  arrowRight: '→',\n  tick: '✔',\n  info: 'ℹ',\n  warning: '⚠',\n  cross: '✖',\n  squareSmallFilled: '◼',\n  pointer: '❯',\n};\n\nconst fallbackSymbols = {\n  arrowRight: '→',\n  tick: '√',\n  info: 'i',\n  warning: '‼',\n  cross: '×',\n  squareSmallFilled: '■',\n  pointer: '>',\n};\n\nexport default isUnicodeSupported() ? symbols : fallbackSymbols;\n"],"names":["isUnicodeSupported","env","process","TERM","TERM_PROGRAM","platform","Boolean","WT_SESSION","TERMINUS_SUBLIME","ConEmuTask","TERMINAL_EMULATOR","symbols","arrowRight","tick","info","warning","cross","squareSmallFilled","pointer","fallbackSymbols"],"mappings":";;;;+BA4CA;;;eAAA;;;AA5CA,6DAA6D;AAC7D,SAASA;IACP,IAAM,AAAEC,MAAQC,QAARD;IACR,IAAQE,OAAuBF,IAAvBE,MAAMC,eAAiBH,IAAjBG;IAEd,IAAIF,QAAQG,QAAQ,KAAK,SAAS;QAChC,OAAOF,SAAS,SAAS,yBAAyB;IACpD;IAEA,OACEG,QAAQL,IAAIM,UAAU,KAAK,mBAAmB;IAC9CD,QAAQL,IAAIO,gBAAgB,KAAK,qBAAqB;IACtDP,IAAIQ,UAAU,KAAK,kBAAkB,mBAAmB;IACxDL,iBAAiB,sBACjBA,iBAAiB,YACjBD,SAAS,oBACTA,SAAS,eACTA,SAAS,kBACTA,SAAS,2BACTF,IAAIS,iBAAiB,KAAK;AAE9B;AAEA,+CAA+C;AAC/C,IAAMC,UAAU;IACdC,YAAY;IACZC,MAAM;IACNC,MAAM;IACNC,SAAS;IACTC,OAAO;IACPC,mBAAmB;IACnBC,SAAS;AACX;AAEA,IAAMC,kBAAkB;IACtBP,YAAY;IACZC,MAAM;IACNC,MAAM;IACNC,SAAS;IACTC,OAAO;IACPC,mBAAmB;IACnBC,SAAS;AACX;IAEA,WAAelB,uBAAuBW,UAAUQ"}

package/dist/cjs/spawnTerminal.js

@@ -57,6 +57,9 @@ function worker(command, args, spawnOptions, options, callback) {
     }).catch(callback);
 }
 function spawnTerminal(command, args, spawnOptions, options, callback) {
+    if (spawnOptions.stdio === 'inherit' && spawnOptions.encoding) {
+        throw new Error("Options 'stdio: inherit' and 'encoding' are mutually exclusive. Use 'stdio: inherit' to display output, or 'encoding' to collect output.");
+    }
     if (typeof options === 'function') {
         callback = options;
         options = {};

package/dist/cjs/spawnTerminal.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/spawnTerminal.ts"],"sourcesContent":["import type { SpawnOptions, SpawnResult, TerminalCallback, TerminalOptions } from './types.ts';\n\nfunction worker(command: string, args: string[], spawnOptions: SpawnOptions, options: TerminalOptions, callback: TerminalCallback): undefined {\n  import('./worker.js')\n    .then((fn) => {\n      fn.default(command, args, spawnOptions, options, callback);\n    })\n    .catch(callback);\n}\n\nexport default function spawnTerminal(command: string, args: string[], spawnOptions: SpawnOptions, options?: TerminalOptions | TerminalCallback, callback?: TerminalCallback): undefined | Promise<SpawnResult> {\n  if (typeof options === 'function') {\n    callback = options as TerminalCallback;\n    options = {};\n  }\n  options = options || {};\n\n  if (typeof callback === 'function') return worker(command, args, spawnOptions, options, callback as TerminalCallback);\n  return new Promise((resolve, reject) =>\n    worker(command, args, spawnOptions, options, (err, result) => {\n      err ? reject(err) : resolve(result);\n    })\n  );\n}\n"],"names":["spawnTerminal","worker","command","args","spawnOptions","options","callback","then","fn","default","catch","Promise","resolve","reject","err","result"],"mappings":";;;;+BAUA;;;eAAwBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AARxB,SAASC,OAAOC,OAAe,EAAEC,IAAc,EAAEC,YAA0B,EAAEC,OAAwB,EAAEC,QAA0B;IAC/H;uDAAA,QAAO;OACJC,IAAI,CAAC,SAACC;QACLA,GAAGC,OAAO,CAACP,SAASC,MAAMC,cAAcC,SAASC;IACnD,GACCI,KAAK,CAACJ;AACX;AAEe,SAASN,cAAcE,OAAe,EAAEC,IAAc,EAAEC,YAA0B,EAAEC,OAA4C,EAAEC,QAA2B;IAC1K,IAAI,OAAOD,YAAY,YAAY;QACjCC,WAAWD;QACXA,UAAU,CAAC;IACb;IACAA,UAAUA,WAAW,CAAC;IAEtB,IAAI,OAAOC,aAAa,YAAY,OAAOL,OAAOC,SAASC,MAAMC,cAAcC,SAASC;IACxF,OAAO,IAAIK,QAAQ,SAACC,SAASC;eAC3BZ,OAAOC,SAASC,MAAMC,cAAcC,SAAS,SAACS,KAAKC;YACjDD,MAAMD,OAAOC,OAAOF,QAAQG;QAC9B;;AAEJ"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/spawnTerminal.ts"],"sourcesContent":["import type { SpawnOptions, SpawnResult, TerminalCallback, TerminalOptions } from './types.ts';\n\nfunction worker(command: string, args: string[], spawnOptions: SpawnOptions, options: TerminalOptions, callback: TerminalCallback): undefined {\n  import('./worker.js')\n    .then((fn) => {\n      fn.default(command, args, spawnOptions, options, callback);\n    })\n    .catch(callback);\n}\n\nexport default function spawnTerminal(command: string, args: string[], spawnOptions: SpawnOptions, options?: TerminalOptions | TerminalCallback, callback?: TerminalCallback): undefined | Promise<SpawnResult> {\n  if (spawnOptions.stdio === 'inherit' && spawnOptions.encoding) {\n    throw new Error(\"Options 'stdio: inherit' and 'encoding' are mutually exclusive. Use 'stdio: inherit' to display output, or 'encoding' to collect output.\");\n  }\n\n  if (typeof options === 'function') {\n    callback = options as TerminalCallback;\n    options = {};\n  }\n  options = options || {};\n\n  if (typeof callback === 'function') return worker(command, args, spawnOptions, options, callback as TerminalCallback);\n  return new Promise((resolve, reject) =>\n    worker(command, args, spawnOptions, options, (err, result) => {\n      err ? reject(err) : resolve(result);\n    })\n  );\n}\n"],"names":["spawnTerminal","worker","command","args","spawnOptions","options","callback","then","fn","default","catch","stdio","encoding","Error","Promise","resolve","reject","err","result"],"mappings":";;;;+BAUA;;;eAAwBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AARxB,SAASC,OAAOC,OAAe,EAAEC,IAAc,EAAEC,YAA0B,EAAEC,OAAwB,EAAEC,QAA0B;IAC/H;uDAAA,QAAO;OACJC,IAAI,CAAC,SAACC;QACLA,GAAGC,OAAO,CAACP,SAASC,MAAMC,cAAcC,SAASC;IACnD,GACCI,KAAK,CAACJ;AACX;AAEe,SAASN,cAAcE,OAAe,EAAEC,IAAc,EAAEC,YAA0B,EAAEC,OAA4C,EAAEC,QAA2B;IAC1K,IAAIF,aAAaO,KAAK,KAAK,aAAaP,aAAaQ,QAAQ,EAAE;QAC7D,MAAM,IAAIC,MAAM;IAClB;IAEA,IAAI,OAAOR,YAAY,YAAY;QACjCC,WAAWD;QACXA,UAAU,CAAC;IACb;IACAA,UAAUA,WAAW,CAAC;IAEtB,IAAI,OAAOC,aAAa,YAAY,OAAOL,OAAOC,SAASC,MAAMC,cAAcC,SAASC;IACxF,OAAO,IAAIQ,QAAQ,SAACC,SAASC;eAC3Bf,OAAOC,SAASC,MAAMC,cAAcC,SAAS,SAACY,KAAKC;YACjDD,MAAMD,OAAOC,OAAOF,QAAQG;QAC9B;;AAEJ"}

package/dist/cjs/src/components/App.d.ts

@@ -1,5 +1 @@
-import type Store from '../state/Store.js';
-export interface AppProps {
-    store: Store;
-}
-export default function App({ store }: AppProps): React.JSX.Element;
+export default function App(): React.JSX.Element;

package/dist/cjs/src/createApp.d.ts

@@ -1,7 +1,6 @@
-import { default as Store } from './state/Store.js';
-export type RetainCallback = (app: Store) => undefined;
-export type ReleaseCallback = () => undefined;
+import { type ProcessStore } from './state/processStore.js';
+export type ReleaseCallback = () => void;
 export default function createApp(): {
-    retain(fn: RetainCallback): undefined;
-    release(cb: ReleaseCallback): undefined;
+    retain(): ProcessStore;
+    release(callback: ReleaseCallback): void;
 };

package/dist/cjs/src/state/processStore.d.ts

@@ -0,0 +1,21 @@
+import type { ChildProcess, Line } from '../types.js';
+type Listener = () => void;
+declare class ProcessStore {
+    private processes;
+    private listeners;
+    private shouldExit;
+    private exitCallback;
+    subscribe: (listener: Listener) => (() => void);
+    getSnapshot: () => ChildProcess[];
+    addProcess(process: ChildProcess): void;
+    updateProcess(id: string, update: Partial<ChildProcess>): void;
+    appendLines(id: string, newLines: Line[]): void;
+    getProcess(id: string): ChildProcess | undefined;
+    signalExit(callback: () => void): void;
+    getShouldExit: () => boolean;
+    getExitCallback: () => (() => void) | null;
+    reset(): void;
+    private notify;
+}
+export declare const processStore: ProcessStore;
+export type { ProcessStore };

package/dist/cjs/state/processStore.js

@@ -0,0 +1,143 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "processStore", {
+    enumerable: true,
+    get: function() {
+        return processStore;
+    }
+});
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
+function _class_call_check(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+var ProcessStore = /*#__PURE__*/ function() {
+    "use strict";
+    function ProcessStore() {
+        var _this = this;
+        _class_call_check(this, ProcessStore);
+        this.processes = [];
+        this.listeners = new Set();
+        this.shouldExit = false;
+        this.exitCallback = null;
+        // useSyncExternalStore API
+        this.subscribe = function(listener) {
+            _this.listeners.add(listener);
+            return function() {
+                return _this.listeners.delete(listener);
+            };
+        };
+        this.getSnapshot = function() {
+            return _this.processes;
+        };
+        this.getShouldExit = function() {
+            return _this.shouldExit;
+        };
+        this.getExitCallback = function() {
+            return _this.exitCallback;
+        };
+    }
+    var _proto = ProcessStore.prototype;
+    // Mutations - Ink handles render throttling at 30 FPS
+    _proto.addProcess = function addProcess(process) {
+        this.processes = _to_consumable_array(this.processes).concat([
+            process
+        ]);
+        this.notify();
+    };
+    _proto.updateProcess = function updateProcess(id, update) {
+        this.processes = this.processes.map(function(p) {
+            return p.id === id ? _object_spread({}, p, update) : p;
+        });
+        this.notify();
+    };
+    _proto.appendLines = function appendLines(id, newLines) {
+        var process = this.processes.find(function(p) {
+            return p.id === id;
+        });
+        if (process) {
+            this.updateProcess(id, {
+                lines: process.lines.concat(newLines)
+            });
+        }
+    };
+    _proto.getProcess = function getProcess(id) {
+        return this.processes.find(function(p) {
+            return p.id === id;
+        });
+    };
+    // Exit signaling
+    _proto.signalExit = function signalExit(callback) {
+        this.shouldExit = true;
+        this.exitCallback = callback;
+        this.notify();
+    };
+    _proto.reset = function reset() {
+        this.processes = [];
+        this.shouldExit = false;
+        this.exitCallback = null;
+    };
+    _proto.notify = function notify() {
+        this.listeners.forEach(function(l) {
+            l();
+        });
+    };
+    return ProcessStore;
+}();
+var processStore = new ProcessStore();
+/* CJS INTEROP */ if (exports.__esModule && exports.default) { try { Object.defineProperty(exports.default, '__esModule', { value: true }); for (var key in exports) { exports.default[key] = exports[key]; } } catch (_) {}; module.exports = exports.default; }

package/dist/cjs/state/processStore.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/state/processStore.ts"],"sourcesContent":["import type { ChildProcess, Line } from '../types.ts';\n\ntype Listener = () => void;\n\nclass ProcessStore {\n  private processes: ChildProcess[] = [];\n  private listeners = new Set<Listener>();\n  private shouldExit = false;\n  private exitCallback: (() => void) | null = null;\n\n  // useSyncExternalStore API\n  subscribe = (listener: Listener): (() => void) => {\n    this.listeners.add(listener);\n    return () => this.listeners.delete(listener);\n  };\n\n  getSnapshot = (): ChildProcess[] => this.processes;\n\n  // Mutations - Ink handles render throttling at 30 FPS\n  addProcess(process: ChildProcess): void {\n    this.processes = [...this.processes, process];\n    this.notify();\n  }\n\n  updateProcess(id: string, update: Partial<ChildProcess>): void {\n    this.processes = this.processes.map((p) => (p.id === id ? { ...p, ...update } : p));\n    this.notify();\n  }\n\n  appendLines(id: string, newLines: Line[]): void {\n    const process = this.processes.find((p) => p.id === id);\n    if (process) {\n      this.updateProcess(id, { lines: process.lines.concat(newLines) });\n    }\n  }\n\n  getProcess(id: string): ChildProcess | undefined {\n    return this.processes.find((p) => p.id === id);\n  }\n\n  // Exit signaling\n  signalExit(callback: () => void): void {\n    this.shouldExit = true;\n    this.exitCallback = callback;\n    this.notify();\n  }\n\n  getShouldExit = (): boolean => this.shouldExit;\n  getExitCallback = (): (() => void) | null => this.exitCallback;\n\n  reset(): void {\n    this.processes = [];\n    this.shouldExit = false;\n    this.exitCallback = null;\n  }\n\n  private notify(): void {\n    this.listeners.forEach((l) => {\n      l();\n    });\n  }\n}\n\nexport const processStore = new ProcessStore();\nexport type { ProcessStore };\n"],"names":["processStore","ProcessStore","processes","listeners","Set","shouldExit","exitCallback","subscribe","listener","add","delete","getSnapshot","getShouldExit","getExitCallback","addProcess","process","notify","updateProcess","id","update","map","p","appendLines","newLines","find","lines","concat","getProcess","signalExit","callback","reset","forEach","l"],"mappings":";;;;+BA+DaA;;;eAAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA3Db,IAAA,AAAMC,6BAAN;;aAAMA;;gCAAAA;aACIC,YAA4B,EAAE;aAC9BC,YAAY,IAAIC;aAChBC,aAAa;aACbC,eAAoC;QAE5C,2BAA2B;aAC3BC,YAAY,SAACC;YACX,MAAKL,SAAS,CAACM,GAAG,CAACD;YACnB,OAAO;uBAAM,MAAKL,SAAS,CAACO,MAAM,CAACF;;QACrC;aAEAG,cAAc;mBAAsB,MAAKT,SAAS;;aA+BlDU,gBAAgB;mBAAe,MAAKP,UAAU;;aAC9CQ,kBAAkB;mBAA2B,MAAKP,YAAY;;;iBA5C1DL;IAcJ,sDAAsD;IACtDa,OAAAA,UAGC,GAHDA,SAAAA,WAAWC,OAAqB;QAC9B,IAAI,CAACb,SAAS,GAAG,AAAC,qBAAG,IAAI,CAACA,SAAS,SAAlB;YAAoBa;SAAQ;QAC7C,IAAI,CAACC,MAAM;IACb;IAEAC,OAAAA,aAGC,GAHDA,SAAAA,cAAcC,EAAU,EAAEC,MAA6B;QACrD,IAAI,CAACjB,SAAS,GAAG,IAAI,CAACA,SAAS,CAACkB,GAAG,CAAC,SAACC;mBAAOA,EAAEH,EAAE,KAAKA,KAAK,mBAAKG,GAAMF,UAAWE;;QAChF,IAAI,CAACL,MAAM;IACb;IAEAM,OAAAA,WAKC,GALDA,SAAAA,YAAYJ,EAAU,EAAEK,QAAgB;QACtC,IAAMR,UAAU,IAAI,CAACb,SAAS,CAACsB,IAAI,CAAC,SAACH;mBAAMA,EAAEH,EAAE,KAAKA;;QACpD,IAAIH,SAAS;YACX,IAAI,CAACE,aAAa,CAACC,IAAI;gBAAEO,OAAOV,QAAQU,KAAK,CAACC,MAAM,CAACH;YAAU;QACjE;IACF;IAEAI,OAAAA,UAEC,GAFDA,SAAAA,WAAWT,EAAU;QACnB,OAAO,IAAI,CAAChB,SAAS,CAACsB,IAAI,CAAC,SAACH;mBAAMA,EAAEH,EAAE,KAAKA;;IAC7C;IAEA,iBAAiB;IACjBU,OAAAA,UAIC,GAJDA,SAAAA,WAAWC,QAAoB;QAC7B,IAAI,CAACxB,UAAU,GAAG;QAClB,IAAI,CAACC,YAAY,GAAGuB;QACpB,IAAI,CAACb,MAAM;IACb;IAKAc,OAAAA,KAIC,GAJDA,SAAAA;QACE,IAAI,CAAC5B,SAAS,GAAG,EAAE;QACnB,IAAI,CAACG,UAAU,GAAG;QAClB,IAAI,CAACC,YAAY,GAAG;IACtB;IAEA,OAAQU,MAIP,GAJD,SAAQA;QACN,IAAI,CAACb,SAAS,CAAC4B,OAAO,CAAC,SAACC;YACtBA;QACF;IACF;WAxDI/B;;AA2DC,IAAMD,eAAe,IAAIC"}

package/dist/cjs/worker.js

@@ -91,30 +91,6 @@ function _object_spread(target) {
     }
     return target;
 }
-function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
-    }
-    return keys;
-}
-function _object_spread_props(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
-}
 function _object_without_properties(source, excluded) {
     if (source == null) return {};
     var target = _object_without_properties_loose(source, excluded);
@@ -149,89 +125,16 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
         "stdio"
     ]);
     if (stdio === 'inherit') {
-        terminal.retain(function(store) {
-            var id = _crypto.default.randomUUID();
-            store.addProcess(_object_spread({
-                id: id,
-                title: [
-                    command
-                ].concat((0, _formatArgumentsts.default)(args)).join(' '),
-                state: 'running',
-                lines: []
-            }, options));
-            var cp = (0, _crossspawncb.crossSpawn)(command, args, csOptions);
-            var outputs = {
-                stdout: null,
-                stderr: null
-            };
-            var queue = new _queuecb.default();
-            if (cp.stdout) {
-                outputs.stdout = (0, _addLinests.default)(function(lines) {
-                    var item = store.processes.find(function(x) {
-                        return x.id === id;
-                    });
-                    store.updateProcess(_object_spread_props(_object_spread({}, item), {
-                        lines: item.lines.concat(lines.map(function(text) {
-                            return {
-                                type: _typests.LineType.stdout,
-                                text: text
-                            };
-                        }))
-                    }));
-                });
-                queue.defer(_onone.default.bind(null, cp.stdout.pipe(outputs.stdout), [
-                    'error',
-                    'end',
-                    'close',
-                    'finish'
-                ]));
-            }
-            if (cp.stderr) {
-                outputs.stderr = (0, _addLinests.default)(function(lines) {
-                    var item = store.processes.find(function(x) {
-                        return x.id === id;
-                    });
-                    store.updateProcess(_object_spread_props(_object_spread({}, item), {
-                        lines: item.lines.concat(lines.map(function(text) {
-                            return {
-                                type: _typests.LineType.stderr,
-                                text: text
-                            };
-                        }))
-                    }));
-                });
-                queue.defer(_onone.default.bind(null, cp.stderr.pipe(outputs.stderr), [
-                    'error',
-                    'end',
-                    'close',
-                    'finish'
-                ]));
-            }
-            // FIX: Don't buffer output when pipes are already consuming streams
-            // Adding data listeners to already-piped streams prevents 'close' event from firing
-            queue.defer(_crossspawncb.default.worker.bind(null, cp, csOptions));
-            queue.await(function(err) {
-                var res = err ? err : {};
-                res.stdout = outputs.stdout ? outputs.stdout.output : null;
-                res.stderr = outputs.stderr ? outputs.stderr.output : null;
-                res.output = [
-                    res.stdout,
-                    res.stderr,
-                    null
-                ];
-                var item = store.processes.find(function(x) {
-                    return x.id === id;
-                });
-                store.updateProcess(_object_spread_props(_object_spread({}, item), {
-                    state: err ? 'error' : 'success'
-                }));
-                // ensure rendering completes
-                terminal.release(function() {
-                    err ? callback(err) : callback(null, res);
-                });
-            });
-        });
-    } else {
+        var store = terminal.retain();
+        var id = _crypto.default.randomUUID();
+        store.addProcess(_object_spread({
+            id: id,
+            title: [
+                command
+            ].concat((0, _formatArgumentsts.default)(args)).join(' '),
+            state: 'running',
+            lines: []
+        }, options));
         var cp = (0, _crossspawncb.crossSpawn)(command, args, csOptions);
         var outputs = {
             stdout: null,
@@ -239,8 +142,13 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
         };
         var queue = new _queuecb.default();
         if (cp.stdout) {
-            outputs.stdout = (0, _concatWritablets.default)(function(output) {
-                outputs.stdout.output = output.toString(encoding || 'utf8');
+            outputs.stdout = (0, _addLinests.default)(function(lines) {
+                store.appendLines(id, lines.map(function(text) {
+                    return {
+                        type: _typests.LineType.stdout,
+                        text: text
+                    };
+                }));
             });
             queue.defer(_onone.default.bind(null, cp.stdout.pipe(outputs.stdout), [
                 'error',
@@ -250,8 +158,13 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
             ]));
         }
         if (cp.stderr) {
-            outputs.stderr = (0, _concatWritablets.default)(function(output) {
-                outputs.stderr.output = output.toString(encoding || 'utf8');
+            outputs.stderr = (0, _addLinests.default)(function(lines) {
+                store.appendLines(id, lines.map(function(text) {
+                    return {
+                        type: _typests.LineType.stderr,
+                        text: text
+                    };
+                }));
             });
             queue.defer(_onone.default.bind(null, cp.stderr.pipe(outputs.stderr), [
                 'error',
@@ -260,8 +173,6 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
                 'finish'
             ]));
         }
-        // FIX: Don't buffer output when pipes are already consuming streams
-        // Adding data listeners to already-piped streams prevents 'close' event from firing
         queue.defer(_crossspawncb.default.worker.bind(null, cp, csOptions));
         queue.await(function(err) {
             var res = err ? err : {};
@@ -272,6 +183,52 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
                 res.stderr,
                 null
             ];
+            store.updateProcess(id, {
+                state: err ? 'error' : 'success'
+            });
+            terminal.release(function() {
+                err ? callback(err) : callback(null, res);
+            });
+        });
+    } else {
+        var cp1 = (0, _crossspawncb.crossSpawn)(command, args, csOptions);
+        var outputs1 = {
+            stdout: null,
+            stderr: null
+        };
+        var queue1 = new _queuecb.default();
+        if (cp1.stdout) {
+            outputs1.stdout = (0, _concatWritablets.default)(function(output) {
+                outputs1.stdout.output = output.toString(encoding || 'utf8');
+            });
+            queue1.defer(_onone.default.bind(null, cp1.stdout.pipe(outputs1.stdout), [
+                'error',
+                'end',
+                'close',
+                'finish'
+            ]));
+        }
+        if (cp1.stderr) {
+            outputs1.stderr = (0, _concatWritablets.default)(function(output) {
+                outputs1.stderr.output = output.toString(encoding || 'utf8');
+            });
+            queue1.defer(_onone.default.bind(null, cp1.stderr.pipe(outputs1.stderr), [
+                'error',
+                'end',
+                'close',
+                'finish'
+            ]));
+        }
+        queue1.defer(_crossspawncb.default.worker.bind(null, cp1, csOptions));
+        queue1.await(function(err) {
+            var res = err ? err : {};
+            res.stdout = outputs1.stdout ? outputs1.stdout.output : null;
+            res.stderr = outputs1.stderr ? outputs1.stderr.output : null;
+            res.output = [
+                res.stdout,
+                res.stderr,
+                null
+            ];
             err ? callback(err) : callback(null, res);
         });
     }