v5.10.4

.smartconfig.json

@@ -14,5 +14,14 @@
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "@git.zone/cli": {
+    "release": {
+      "registries": [
+        "https://verdaccio.lossless.digital",
+        "https://registry.npmjs.org"
+      ],
+      "accessLevel": "public"
+    }
   }
 }

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "json.schemas": [
     {
-      "fileMatch": ["/npmextra.json"],
+      "fileMatch": ["/.smartconfig.json"],
       "schema": {
         "type": "object",
         "properties": {

changelog.md

@@ -1,5 +1,251 @@
 # Changelog
 
+## 2026-03-24 - 5.10.4 - fix(crash-logging)
+migrate filesystem persistence to smartfs and stabilize crash log tests
+
+- replace smartfile usage with smartfs in crash log and log persistence modules
+- update crash log tests to use tap assertions and current CLI command output
+- move project config from npmextra.json to .smartconfig.json and refresh build dependencies
+
+## 2026-03-24 - 5.10.3 - fix(config)
+replace npmextra with smartconfig for daemon key-value storage and release settings
+
+- swap the configuration storage dependency from @push.rocks/npmextra to @push.rocks/smartconfig
+- update daemon config accessors to use the smartconfig KeyValueStore implementation
+- add @git.zone/cli release registry and access configuration to npmextra.json
+
+## 2025-09-03 - 5.10.2 - fix(processmonitor)
+Bump smartdaemon and stop aggressive pidusage cache clearing in ProcessMonitor
+
+- Update dependency @push.rocks/smartdaemon from ^2.0.9 to ^2.1.0 in package.json.
+- Remove per-PID pidusage.clear calls in ts/daemon/processmonitor.ts (getProcessGroupStats) to avoid potential errors or unexpected behavior from manually clearing pidusage cache.
+
+## 2025-09-03 - 5.10.1 - fix(processmonitor)
+Skip null pidusage entries when aggregating process-group memory/CPU to avoid errors
+
+- Add defensive check for null/undefined entries returned by pidusage before accessing memory/cpu fields
+- Log a debug message when an individual process stat is null (process may have exited)
+- Improve robustness of ProcessMonitor.getProcessGroupStats to prevent runtime exceptions during aggregation
+
+## 2025-09-01 - 5.10.0 - feat(daemon)
+Add crash log manager with rotation and integrate crash logging; improve IPC & process listener cleanup
+
+- Introduce CrashLogManager to create formatted crash reports, persist them to disk and rotate old logs (max 100)
+- Persist recent process logs, include metadata (exit code, signal, restart attempts, memory) and human-readable sizes in crash reports
+- Integrate crash logging into ProcessMonitor: save crash logs on non-zero exits and errors, and persist/rotate logs
+- Improve ProcessMonitor and ProcessWrapper by tracking and removing event listeners to avoid memory leaks
+- Clear pidusage cache more aggressively to prevent stale entries
+- Enhance TspmIpcClient to store/remove lifecycle event handlers on disconnect to avoid dangling listeners
+- Add tests and utilities: test/test.crashlog.direct.ts, test/test.crashlog.manual.ts and test/test.crashlog.ts to validate crash log creation and rotation
+
+## 2025-08-31 - 5.9.0 - feat(cli)
+Add interactive edit flow to CLI and improve UX
+
+- Add -i / --interactive flag to tspm add to open an interactive editor immediately after adding a process
+- Implement interactiveEditProcess helper (smartinteract-based) to provide interactive editing for process configs
+- Enable tspm edit to launch the interactive editor (replaces prior placeholder flow)
+- Improve user-facing message when no processes are configured in tspm list
+- Lower verbosity for missing saved configs on daemon startup (changed logger.info → logger.debug)
+
+## 2025-08-31 - 5.8.0 - feat(core)
+Add core TypeScript TSPM implementation: CLI, daemon, client, process management and tests
+
+- Add CLI entrypoint and command set (start/stop/add/list/logs/daemon/service/stats/reset and batch ops)
+- Add daemon implementation with ProcessManager, ProcessMonitor, ProcessWrapper, LogPersistence and config storage
+- Add IPC client (tspmIpcClient) and TspmServiceManager for systemd integration using smartipc/smartdaemon
+- Introduce shared protocol types, process ID helpers and standardized error codes for stable IPC
+- Include tests and test assets for daemon, integration and IPC client scenarios
+- Add README and package metadata (package.json, npmextra.json, commitinfo)
+
+## 2025-08-31 - 5.7.0 - feat(cli)
+Add 'stats' CLI command and daemon stats aggregation; fix process manager & wrapper state handling
+
+- Add new 'stats' CLI command to show daemon + process statistics (memory, CPU, uptime, logs in memory, paths, configs) and include it in the default help output
+- Implement daemon-side aggregation for logs-in-memory, per-process log counts/bytes, and expose tspmDir/socket/pidFile and config counts in daemon:status
+- Enhance startById handler to detect already-running monitors and return current status/pid instead of attempting to restart
+- Improve ProcessManager start/restart/stop behavior: if an existing monitor exists but is not running, restart it; ensure PID and status are updated consistently (clear PID on stop)
+- Fix ProcessWrapper lifecycle handling: clear internal process reference on exit, improve isRunning() and getPid() semantics to reflect actual runtime state
+- Update IPC types to include optional metadata fields (paths, configs, logsInMemory) in DaemonStatusResponse
+
+## 2025-08-31 - 5.6.2 - fix(processmanager)
+Improve process lifecycle handling and cleanup in daemon, monitors and wrappers
+
+- StartAll: when a monitor exists but is not running, restart it instead of skipping — ensures saved processes are reliably brought online.
+- ProcessMonitor.stop: cancel any pending restart timers to prevent stray restarts after explicit stop.
+- ProcessWrapper: add killProcessTree helper and use it for graceful (SIGTERM) and force (SIGKILL) shutdowns to reliably signal child processes.
+- Daemon stopAll: yield briefly after stopping processes and inspect monitors (not only processInfo) to accurately report stopped vs failed processes.
+
+## 2025-08-31 - 5.6.1 - fix(daemon)
+Ensure robust process shutdown and improve logs/subscriber diagnostics
+
+- Make ProcessWrapper.stop asynchronous and awaitable to avoid race conditions when stopping processes
+- Signal entire process groups on POSIX (kill by negative PID) and fall back to per-PID signalling; escalate to SIGKILL after a timeout
+- Await processWrapper.stop() from ProcessMonitor when enforcing memory limits or handling exits/errors to ensure child processes are cleaned up
+- Add logs:subscribers IPC endpoint and corresponding types to inspect current subscribers for a process log topic
+- Add optional CLI debug output in logs command (enabled via TSPM_DEBUG=true) to print subscriber counts and details
+- Support passing request.lines to getLogs handler in daemon to limit returned log entries
+
+## 2025-08-30 - 5.6.0 - feat(processmonitor)
+Add CPU monitoring and display CPU in process list
+
+- CLI: show a CPU column in the `tspm list` output (adds formatting and placeholder name display)
+- Daemon: ProcessMonitor now collects CPU usage for the process group in addition to memory
+- Daemon: ProcessMonitor exposes getLastCpuUsage() and ProcessManager syncs CPU values into IProcessInfo
+- Non-breaking: UI and internal stats enriched to surface CPU metrics for processes
+
+## 2025-08-30 - 5.5.0 - feat(logs)
+Improve logs streaming and backlog delivery; add CLI filters and ndjson output
+
+- CLI: add new logs options: --since, --stderr-only, --stdout-only and --ndjson; enhance streaming output and gap detection
+- CLI: fetch backlog conditionally (honoring --since) and print filtered results before live streaming
+- Client: add TspmIpcClient.requestLogsBacklogStream, onStream and onBacklogTopic helpers to receive backlog chunks and streams
+- Daemon: add logs:subscribe IPC handler to stream backlog entries to requesting client in small batches
+- Protocol: extend IPC types with LogsSubscribeRequest/Response and register 'logs:subscribe' method
+- Dependency: bump @push.rocks/smartipc to ^2.3.0 to support the streaming/IPC changes
+
+## 2025-08-30 - 5.4.2 - fix(cli/process/logs)
+Reset log sequence on process restart to avoid false log gap warnings
+
+- Track process runId when streaming logs and initialize lastRunId from fetched logs
+- When a new runId is detected, reset lastSeq so that subsequent streamed logs are accepted (prevents spurious gap warnings)
+- Emit an informational message when a restart/runId change is detected to aid debugging of log streams
+
+## 2025-08-30 - 5.4.1 - fix(processmonitor)
+Bump tsbuild devDependency and relax ps-tree callback typing in ProcessMonitor
+
+- Update devDependency @git.zone/tsbuild from ^2.6.7 to ^2.6.8
+- Change psTree callback types in ts/daemon/processmonitor.ts to accept any error and ReadonlyArray for children to improve type compatibility
+
+## 2025-08-30 - 5.4.0 - feat(daemon)
+Add CLI systemd service refresh on version mismatch and fix daemon memory leak; update dependencies
+
+- CLI: when client and daemon versions differ, prompt to refresh the systemd service and optionally disable/enable the service automatically
+- Daemon: clear pidusage state for PIDs on process exit/stop to prevent memory leaks in long-running monitors
+- Client: expose smartdaemon in client plugin exports and fix import path for tspm.servicemanager
+- Package: tighten dependency ranges (set specific versions) and add @types for pidusage and ps-tree
+- Misc: ensure IPC disconnects and PID/socket handling improvements were integrated alongside the above changes
+
+## 2025-08-30 - 5.3.2 - fix(daemon)
+Improve daemon log delivery and process monitor memory accounting; gate debug output and update tests to numeric ProcessId
+
+- Deliver process logs only to subscribed clients instead of broadcasting to all connections (reduce unnecessary IPC traffic and noise)
+- Implement incremental log memory accounting in ProcessMonitor using an estimateLogSize helper and WeakMap to avoid repeated JSON.stringify and reduce CPU/memory overhead
+- Seed the incremental size map when loading persisted logs so memory accounting is accurate after restart
+- Trim logs incrementally by subtracting estimated sizes of removed entries (avoids O(n) recalculation)
+- Gate verbose console/debug output behind TSPM_DEBUG to prevent spamming in normal runs (applies to ProcessWrapper and ProcessMonitor)
+- Improve process wrapper stdout/stderr debug logging to be conditional on debug mode
+- Update tests to use numeric ProcessId via toProcessId(...) for consistency with typed IDs
+
+## 2025-08-30 - 5.3.1 - fix(client(tspmIpcClient))
+Use bare topic names for IPC client subscribe/unsubscribe to fix log subscription issues
+
+- Updated ts/client/tspm.ipcclient.ts to call ipcClient.subscribe/unsubscribe with the bare topic (e.g. 'logs.<id>') instead of prefixed 'topic:<...>'.
+- Added comments clarifying that the IpcClient registers the 'topic:' prefix internally.
+- Fixes incorrect topic registration that could prevent log streaming handlers from receiving messages.
+
+## 2025-08-30 - 5.3.0 - feat(cli/daemon/processmonitor)
+Add flexible target resolution and search command; improve restart/backoff and error handling
+
+- Add new cli command `search` to find processes by id or name fragment.
+- Allow flexible process targets in CLI commands (accepts numeric id, id:<n>, or name:<label>) for start/stop/restart/delete/describe/logs/edit commands.
+- Introduce a new daemon IPC method `resolveTarget` to normalize user-provided targets to ProcessId (supports id:<n>, name:<label>, or bare numeric id).
+- Keep `remove` as a CLI alias but daemon exposes `delete` only; CLI resolves targets and always calls daemon `delete`.
+- Implement scheduled restart/backoff in ProcessMonitor with incremental debounce, max retries, and a 1-hour reset window.
+- Emit a `failed` event from ProcessMonitor when max restart attempts are exceeded; ProcessManager listens and marks processes as `errored` and clears pid.
+- Ensure desired state is set to `stopped` before deleting a process to avoid race conditions.
+- Improve cli output messages to include resolved names alongside numeric ids where available.
+
+## 2025-08-30 - 5.2.0 - feat(cli)
+Preserve CLI environment when adding processes, simplify edit flow, and refresh README docs
+
+- CLI: When adding a process, capture and persist essential environment variables from the CLI (PATH, HOME, USER, SHELL, LANG, LC_ALL, NODE_ENV, NODE_PATH, npm_config_prefix and any TSPM_* variables). Undefined values are removed before storing.
+- CLI: Interactive edit flow temporarily disabled. The edit command now displays the current configuration and updates stored environment variables to match the current CLI environment.
+- Docs: Major README refresh — reorganized sections, clarified add vs start semantics, expanded examples, added daemon/service usage and programmatic API examples, and improved command reference and output examples.
+
+## 2025-08-30 - 5.1.0 - feat(cli)
+Add interactive edit command and update support for process configurations
+
+- Add 'tspm edit' interactive CLI command to modify saved process configurations (prompts for name, command, args, cwd, memory, autorestart, watch, watch paths) with an option to replace stored PATH.
+- Implement ProcessManager.update(id, updates) to merge updates, persist them, and return the updated configuration.
+- Add 'update' IPC method and daemon handler to allow remote/configurations updates via IPC.
+- Persist the current CLI PATH when adding a process so managed processes inherit the same PATH environment.
+- Merge provided env with the runtime process.env when spawning processes to avoid fully overriding the runtime environment.
+
+## 2025-08-30 - 5.0.0 - BREAKING CHANGE(daemon)
+Introduce persistent log storage, numeric ProcessId type, and improved process monitoring / IPC handling
+
+- Add LogPersistence: persistent on-disk storage for process logs (save/load/delete/cleanup).
+- Persist logs on process exit/error/stop and trim in-memory buffers to avoid excessive memory usage.
+- Introduce a branded numeric ProcessId type and toProcessId helpers; migrate IPC types and internal maps from string ids to ProcessId.
+- ProcessManager refactor: typed maps for processes/configs/info/logs, async start/stop/restart flows, improved PID/uptime/restart tracking, and desired state persistence handling.
+- ProcessMonitor refactor: async lifecycle (start/stop), load persisted logs on startup, flush logs to disk on exit/error/stop, log memory capping, and improved event emissions.
+- ProcessWrapper improvements: buffer stdout/stderr remainders, flush partial lines on stream end, clearer debug logging.
+- IPC client/server changes: handlers now normalize ids with toProcessId, subscribe/unsubscribe accept numeric/string ids, getLogs/start/stop/restart/delete use typed ids.
+- CLI tweaks: format process id output safely with String() to avoid formatting issues.
+- Add dependency and plugin export for @push.rocks/smartfile and update package.json accordingly.
+
+## 2025-08-29 - 4.4.2 - fix(daemon)
+Fix daemon IPC id handling, reload configs on demand and correct CLI daemon start path
+
+- Normalize process IDs in daemon IPC handlers (trim strings) to avoid lookup mismatches
+- Attempt to reload saved process configurations when a startById request cannot find a config (handles races/stale state)
+- Use normalized IDs in responses and messages for stop/restart/delete/remove/describe handlers
+- Fix CLI daemon start path to point at dist_ts/daemon/tspm.daemon.js when launching the background daemon
+- Ensure the IPC client disconnects after showing CLI version/status to avoid leaked connections
+
+## 2025-08-29 - 4.4.1 - fix(cli)
+Use server-side start-by-id flow for starting processes
+
+- CLI: 'tspm start <id>' now calls a new 'startById' IPC method instead of fetching the full config via 'describe' and submitting it back to 'start'.
+- Daemon: Added server-side handler for 'startById' which resolves the stored process config and starts the process on the daemon.
+- Protocol: Added StartByIdRequest/StartByIdResponse types and registered 'startById' in the IPC method map.
+
+## 2025-08-29 - 4.4.0 - feat(daemon)
+Persist desired process states and add daemon restart command
+
+- Persist desired process states: ProcessManager now stores desiredStates to user storage (desiredStates key) and reloads them on startup.
+- Start/stop operations update desired state: IPC handlers in the daemon now set desired state when processes are started, stopped, restarted or when batch start/stop is invoked.
+- Resume desired state on daemon start: Daemon loads desired states and calls startDesired() to bring processes to their desired 'online' state after startup.
+- Remove desired state on deletion/reset: Deleting a process or resetting clears its desired state; reset clears all desired states as well.
+- CLI: Added 'tspm daemon restart' — stops the daemon (gracefully) and restarts it in the foreground for the current session, with checks and informative output.
+
+## 2025-08-29 - 4.3.1 - fix(daemon)
+Fix daemon describe handler to return correct process info and config; bump @push.rocks/smartipc to ^2.2.2
+
+- Corrected the 'describe' IPC handler in the daemon to use ProcessManager.describe(...) result and return { processInfo, config } — this fixes a mismatch between the handler and the ProcessManager.describe() return shape.
+- Bumped dependency @push.rocks/smartipc to ^2.2.2 in package.json.
+
+## 2025-08-29 - 4.3.0 - feat(cli)
+Correct CLI plugin imports and add reset command/IPC to stop processes and clear persisted configs
+
+- Fixed relative plugin imports in many CLI command modules to use the local CLI plugin wrapper (reduces startup surface and fixes import paths).
+- Added a lightweight ts/cli/plugins.ts that exposes only the minimal plugin set used by the CLI.
+- Implemented ProcessManager.reset(): stops running processes, collects per-id stop errors, clears in-memory maps and removes persisted configurations (with fallback to write an empty list on delete failure).
+- Daemon now exposes a 'reset' IPC handler that delegates to ProcessManager.reset() so CLI can perform a single RPC to reset TSPM state.
+- Updated shared IPC protocol types to include ResetRequest and ResetResponse.
+- Refactored the CLI reset command to call the new 'reset' RPC (replaces previous stopAll + per-config removal logic).
+
+## 2025-08-29 - 4.2.0 - feat(cli)
+Add 'reset' CLI command to stop all processes and clear saved configurations; integrate interactive confirmation and client plugin updates
+
+- Add new CLI command 'reset' (ts/cli/commands/reset.ts) which stops all processes and removes saved process configurations after an interactive confirmation.
+- Use @push.rocks/smartinteract for a confirmation prompt before destructive action.
+- Register the new reset command in the CLI bootstrap (ts/cli/index.ts).
+- Expose smartinteract from ts/plugins.ts and add @push.rocks/smartinteract to package.json dependencies.
+- Introduce a lightweight client plugin shim (ts/client/plugins.ts) and switch tspm.ipcclient to import client plugins from ./plugins.js.
+
+## 2025-08-29 - 4.1.1 - fix(daemon)
+Bump @push.rocks/smartdaemon to ^2.0.9
+
+- Update @push.rocks/smartdaemon from ^2.0.8 to ^2.0.9 (dependency version bump)
+
+## 2025-08-29 - 4.1.0 - feat(cli)
+Add support for restarting all processes from CLI; improve usage message and reporting
+
+- CLI 'restart' command now accepts 'all' to restart all processes via the daemon (tspm restart all).
+- Improved usage/help output when no process id is provided.
+- CLI now prints summaries of restarted process IDs and failed restarts and sets a non-zero exit code when any restarts failed.
+
 ## 2025-08-29 - 4.0.0 - BREAKING CHANGE(cli)
 Add persistent process registration (tspm add), alias remove, and change start to use saved process IDs (breaking CLI behavior)
 

license

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Task Venture Capital GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@git.zone/tspm",
-  "version": "4.0.0",
+  "version": "5.10.4",
   "private": false,
   "description": "a no fuzz process manager",
   "main": "dist_ts/index.js",
@@ -16,7 +16,7 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --verbose --logfile --timeout 60)",
-    "build": "(tsbuild --web --allowimplicitany)",
+    "build": "(tsbuild)",
     "buildDocs": "(tsdoc)",
     "start": "(tsrun ./cli.ts -v)"
   },
@@ -24,23 +24,27 @@
     "tspm": "./cli.js"
   },
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.6.7",
-    "@git.zone/tsbundle": "^2.5.1",
-    "@git.zone/tsrun": "^1.2.46",
-    "@git.zone/tstest": "^2.3.5",
+    "@git.zone/tsbuild": "^4.3.0",
+    "@git.zone/tsbundle": "^2.9.3",
+    "@git.zone/tsrun": "^2.0.1",
+    "@git.zone/tstest": "^3.5.1",
     "@push.rocks/tapbundle": "^6.0.3",
-    "@types/node": "^22.13.10"
+    "@types/node": "^25.5.0"
   },
   "dependencies": {
-    "@push.rocks/npmextra": "^5.3.3",
     "@push.rocks/projectinfo": "^5.0.2",
-    "@push.rocks/smartcli": "^4.0.11",
-    "@push.rocks/smartdaemon": "^2.0.8",
-    "@push.rocks/smartipc": "^2.2.1",
+    "@push.rocks/smartcli": "^4.0.20",
+    "@push.rocks/smartconfig": "^6.0.1",
+    "@push.rocks/smartdaemon": "^2.1.0",
+    "@push.rocks/smartfs": "^1.5.0",
+    "@push.rocks/smartinteract": "^2.0.16",
+    "@push.rocks/smartipc": "^2.3.0",
     "@push.rocks/smartpath": "^6.0.0",
+    "@types/pidusage": "^2.0.5",
+    "@types/ps-tree": "^1.1.6",
     "pidusage": "^4.0.1",
     "ps-tree": "^1.2.0",
-    "tsx": "^4.20.5"
+    "tsx": "^4.21.0"
   },
   "repository": {
     "type": "git",
@@ -59,7 +63,7 @@
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
-    "npmextra.json",
+    ".smartconfig.json",
     "readme.md"
   ],
   "pnpm": {

readme.hints.md

@@ -1,3 +1,16 @@
 # Project Readme Hints
 
-This is the initial readme hints file.
+## Build Tools
+- Uses `@git.zone/tsbuild` v4.x — just `tsbuild` with no extra flags needed
+- Uses `@git.zone/tstest` v3.x — zero-config, file naming convention for runtime selection
+- Uses `@git.zone/tsrun` v2.x — zero-config TypeScript execution via tsx
+
+## Key Architectural Decisions
+- **No smartfile dependency** — replaced with native Node.js `fs/promises` for filesystem operations in crashlogmanager.ts and logpersistence.ts (smartfile v13 removed the `fs` and `memory` namespaces)
+- **smartconfig** (not npmextra) — configuration stored in `.smartconfig.json` using `@push.rocks/smartconfig` KeyValueStore
+- **Three test categories**: unit tests (test.ts, test.daemon.ts, test.ipcclient.ts), direct tests (test.crashlog.direct.ts), and integration tests (test.crashlog.ts, test.crashlog.manual.ts) that require a running daemon
+
+## Integration Tests
+- The crashlog integration tests (`test.crashlog.ts`, `test.crashlog.manual.ts`) depend on a running daemon and CLI output parsing
+- They gracefully skip when daemon can't be started in the test environment
+- The CLI `add` command outputs `Assigned ID: <number>` (not `Process added with ID:`)

readme.md

@@ -1,362 +1,475 @@
 # @git.zone/tspm 🚀
 
-**TypeScript Process Manager** - A robust, no-fuss process manager designed specifically for TypeScript and Node.js applications. Built for developers who need reliable process management without the complexity.
+**TypeScript Process Manager** — A robust, no-fuss process manager built for the modern TypeScript and Node.js ecosystem. Production-ready process management without the bloat.
 
-## 🎯 What TSPM Does
+## Issue Reporting and Security
 
-TSPM is your production-ready process manager that handles the hard parts of running Node.js applications:
+For reporting bugs, issues, or security vulnerabilities, please visit [community.foss.global/](https://community.foss.global/). This is the central community hub for all issue reporting. Developers who sign and comply with our contribution agreement and go through identification can also get a [code.foss.global/](https://code.foss.global/) account to submit Pull Requests directly.
 
-- **Automatic Memory Management** - Set memory limits and let TSPM handle the rest
-- **Smart Auto-Restart** - Crashed processes come back automatically (when you want them to)
-- **File Watching** - Auto-restart on file changes during development
-- **Process Groups** - Track parent and child processes together
-- **Daemon Architecture** - Survives terminal sessions with a persistent background daemon
-- **Beautiful CLI** - Clean, informative terminal output with real-time status
-- **Structured Logging** - Capture and manage stdout/stderr with intelligent buffering
-- **Zero Config** - Works out of the box, customize when you need to
+## 🎯 What is TSPM?
+
+TSPM is your production-ready process manager that handles the hard parts of running Node.js applications. Think PM2, but built from scratch for the TypeScript-first ecosystem with better memory management, intelligent logging, a clean daemon architecture, and native ESM support.
+
+### ✨ Key Features
+
+- 🧠 **Smart Memory Management** — Tracks memory across entire process trees (parent + children), enforces limits, and auto-restarts on OOM
+- 💾 **Persistent Log Storage** — 10MB in-memory ring buffer per process, auto-persists to disk on stop/restart/crash
+- 🔄 **Intelligent Auto-Restart** — Crashed processes restart with incremental backoff (1s → 10s), auto-stop after 10 consecutive failures
+- 👀 **File Watching** — Auto-restart on file changes for seamless development workflows
+- 🌳 **Process Tree Tracking** — Monitors parent and all child processes as a unit — no orphans, ever
+- 🏗️ **Daemon Architecture** — Persistent background service that survives terminal sessions via Unix socket IPC
+- 📊 **Beautiful CLI** — Clean, informative output with table views, real-time log streaming, and search
+- ⚡ **Zero Config** — Works out of the box; customize only when you need to
+- 🔌 **Systemd Integration** — Run as a system service for production deployments with `tspm enable`
+- 🔍 **Crash Log Reports** — Detailed crash reports with metadata, memory snapshots, and log history
 
 ## 📦 Installation
 
 ```bash
-# Install globally
-npm install -g @git.zone/tspm
-
-# Or with pnpm (recommended)
+# Global install (recommended)
 pnpm add -g @git.zone/tspm
 
-# Or use in your project
-npm install --save-dev @git.zone/tspm
+# Or with npm
+npm install -g @git.zone/tspm
+
+# Or as a project dependency
+pnpm add --save-dev @git.zone/tspm
 ```
 
 ## 🚀 Quick Start
 
 ```bash
-# Start the daemon (happens automatically on first use)
+# Start the daemon
 tspm daemon start
 
-# Start a process
-tspm start server.js --name my-server
+# Add a process
+tspm add "node server.js" --name my-server --memory 1GB
 
-# Start with memory limit
-tspm start app.js --memory 512MB --name my-app
+# Start it
+tspm start name:my-server
 
-# Start with file watching (great for development)
-tspm start dev.js --watch --name dev-server
-
-# List all processes
+# See what's running
 tspm list
 
-# Check process details
-tspm describe my-server
-
 # View logs
-tspm logs my-server --lines 100
+tspm logs name:my-server
 
-# Stop a process
-tspm stop my-server
-
-# Restart a process
-tspm restart my-server
+# Stop it
+tspm stop name:my-server
 ```
 
-## 📋 Command Reference
+## 📋 CLI Reference
+
+### Targeting Processes
+
+Most commands accept flexible process targeting:
+
+| Format | Example | Description |
+|--------|---------|-------------|
+| Numeric ID | `tspm start 1` | Direct ID reference |
+| `id:N` | `tspm start id:1` | Explicit ID prefix |
+| `name:LABEL` | `tspm start name:api` | Target by name |
+
+Use `tspm search <query>` to find processes by name or ID substring.
 
 ### Process Management
 
-#### `tspm start <script> [options]`
+#### `tspm add <command> [options]`
 
-Start a new process with automatic monitoring and management.
+Register a new process configuration (without starting it).
 
-**Options:**
-
-- `--name <name>` - Custom name for the process (default: script name)
-- `--memory <size>` - Memory limit (e.g., "512MB", "2GB", default: 512MB)
-- `--cwd <path>` - Working directory (default: current directory)
-- `--watch` - Enable file watching for auto-restart
-- `--watch-paths <paths>` - Comma-separated paths to watch (with --watch)
-- `--autorestart` - Auto-restart on crash (default: true)
-
-**Examples:**
+| Option | Description | Default |
+|--------|-------------|---------|
+| `--name <name>` | Process name | command string |
+| `--memory <size>` | Memory limit (e.g. `512MB`, `2GB`) | `512MB` |
+| `--cwd <path>` | Working directory | current directory |
+| `--watch` | Enable file watching | `false` |
+| `--watch-paths <paths>` | Comma-separated watch paths | — |
+| `--autorestart` | Auto-restart on crash | `true` |
+| `-i, --interactive` | Enter interactive edit after adding | — |
 
 ```bash
-# Simple start
-tspm start server.js
+# Simple Node.js app
+tspm add "node server.js" --name api-server
 
-# Production setup with 2GB memory
-tspm start app.js --name production-api --memory 2GB
+# TypeScript with 2GB memory limit
+tspm add "tsx src/index.ts" --name production-api --memory 2GB
 
-# Development with watching
-tspm start dev-server.js --watch --watch-paths "src,config" --name dev
+# Dev mode with file watching
+tspm add "tsx watch src/index.ts" --name dev-server --watch --watch-paths "src,config"
 
-# Custom working directory
-tspm start ../other-project/index.js --cwd ../other-project --name other
+# One-shot worker (no auto-restart)
+tspm add "node worker.js" --name batch-job --autorestart false
+
+# Add + interactive edit
+tspm add "node server.js" --name api -i
 ```
 
-#### `tspm stop <id>`
+#### `tspm start <target>`
 
-Gracefully stop a running process (SIGTERM → SIGKILL after timeout).
+Start a registered process.
 
 ```bash
-tspm stop my-server
+tspm start name:my-server
+tspm start id:1
+tspm start 1          # bare numeric id also works
 ```
 
-#### `tspm restart <id>`
+#### `tspm stop <target>`
 
-Stop and restart a process with the same configuration.
+Gracefully stop a process (SIGTERM → 5s grace → SIGKILL).
 
 ```bash
-tspm restart my-server
+tspm stop name:my-server
 ```
 
-#### `tspm delete <id>`
+#### `tspm restart <target>`
 
-Stop and remove a process from TSPM management.
+Stop and restart a process, preserving its configuration.
 
 ```bash
-tspm delete old-server
+tspm restart name:my-server
 ```
 
-### Monitoring & Information
+#### `tspm delete <target>`
+
+Stop, remove from management, and delete persisted logs.
+
+```bash
+tspm delete name:old-server
+```
+
+#### `tspm edit <target>`
+
+Interactively modify a process configuration (name, command, memory, etc.).
+
+```bash
+tspm edit name:my-server
+```
+
+#### `tspm search <query>`
+
+Search processes by name or ID substring.
+
+```bash
+tspm search api
+# Matches for "api":
+#   id:3    name:api-server
+```
+
+### Monitoring
 
 #### `tspm list`
 
-Display all managed processes in a beautiful table.
+Display all managed processes in a table.
 
-```bash
-tspm list
-
-# Output:
-┌─────────┬─────────────┬───────────┬───────────┬──────────┐
-│ ID      │ Name        │ Status    │ Memory    │ Restarts │
-├─────────┼─────────────┼───────────┼───────────┼──────────┤
-│ my-app  │ my-app      │ online    │ 245.3 MB  │ 0        │
-│ worker  │ worker      │ online    │ 128.7 MB  │ 2        │
-└─────────┴─────────────┴───────────┴───────────┴──────────┘
+```
+┌─────┬─────────────┬──────────┬───────┬──────────┬──────────┐
+│ ID  │ Name        │ Status   │ PID   │ Memory   │ Restarts │
+├─────┼─────────────┼──────────┼───────┼──────────┼──────────┤
+│ 1   │ my-app      │ online   │ 45123 │ 245.3 MB │ 0        │
+│ 2   │ worker      │ online   │ 45456 │ 128.7 MB │ 2        │
+│ 3   │ api-server  │ stopped  │ -     │ 0 B      │ 5        │
+└─────┴─────────────┴──────────┴───────┴──────────┴──────────┘
 ```
 
-#### `tspm describe <id>`
+#### `tspm describe <target>`
 
-Get detailed information about a specific process.
+Detailed information about a specific process.
 
 ```bash
-tspm describe my-server
+tspm describe name:my-server
 
-# Output:
-Process Details: my-server
-────────────────────────────────────────
-Status:      online
-PID:         45123
-Memory:      245.3 MB
-CPU:         2.3%
-Uptime:      3600s
-Restarts:    0
-
-Configuration:
-Command:     server.js
-Directory:   /home/user/project
-Memory Limit: 2 GB
-Auto-restart: true
-Watch:       enabled
-Watch Paths: src, config
+# Process Details: my-server
+# ────────────────────────────────────────
+# Status:       online
+# PID:          45123
+# Memory:       245.3 MB
+# Uptime:       3600s
+# Restarts:     0
+#
+# Configuration:
+# ────────────────────────────────────────
+# Command:      node server.js
+# Directory:    /home/user/project
+# Memory Limit: 2 GB
+# Auto-restart: true
+# Watch:        disabled
 ```
 
-#### `tspm logs <id> [options]`
+#### `tspm logs <target> [options]`
 
-View process logs (stdout and stderr).
+View and stream process logs.
 
-**Options:**
-
-- `--lines <n>` - Number of lines to display (default: 50)
+| Option | Description | Default |
+|--------|-------------|---------|
+| `--lines <n>` | Number of lines | `50` |
+| `--since <dur>` | Time filter (`10m`, `2h`, `1d`) | — |
+| `--stderr-only` | Only stderr | — |
+| `--stdout-only` | Only stdout | — |
+| `--ndjson` | Output as newline-delimited JSON | — |
+| `--follow` | Real-time streaming (like `tail -f`) | — |
 
 ```bash
-tspm logs my-server --lines 100
+# View last 50 lines
+tspm logs name:my-server
+
+# Last 100 lines of stderr only
+tspm logs name:my-server --lines 100 --stderr-only
+
+# Stream logs in real time
+tspm logs name:my-server --follow
+
+# NDJSON output since 10 minutes ago
+tspm logs name:my-server --since 10m --ndjson
 ```
 
 ### Batch Operations
 
-#### `tspm start-all`
-
-Start all saved processes at once.
-
 ```bash
-tspm start-all
-```
-
-#### `tspm stop-all`
-
-Stop all running processes.
-
-```bash
-tspm stop-all
-```
-
-#### `tspm restart-all`
-
-Restart all running processes.
-
-```bash
-tspm restart-all
+tspm start-all      # Start all saved processes
+tspm stop-all       # Stop all running processes
+tspm restart-all    # Restart all running processes
+tspm reset          # ⚠️ Stop all + clear all configs (prompts for confirmation)
 ```
 
 ### Daemon Management
 
-#### `tspm daemon start`
-
-Start the TSPM daemon (happens automatically on first command).
+The daemon is a persistent background service that manages all processes. It starts automatically when needed.
 
 ```bash
-tspm daemon start
+tspm daemon start     # Start the daemon
+tspm daemon stop      # Stop daemon + all managed processes
+tspm daemon restart   # Restart daemon (preserves processes)
+tspm daemon status    # Check daemon health + stats
 ```
 
-#### `tspm daemon stop`
-
-Stop the TSPM daemon and all managed processes.
+### System Service (systemd)
 
 ```bash
-tspm daemon stop
+sudo tspm enable      # Install + enable as systemd service (auto-start on boot)
+sudo tspm disable     # Remove systemd service
 ```
 
-#### `tspm daemon status`
-
-Check daemon health and statistics.
+### Version Check
 
 ```bash
-tspm daemon status
-
-# Output:
-TSPM Daemon Status:
-────────────────────────────────────────
-Status:      running
-PID:         12345
-Uptime:      86400s
-Processes:   5
-Memory:      45.2 MB
-CPU:         0.1%
+tspm -v
+# tspm CLI: 5.x.y
+# Daemon: running v5.x.z (pid 1234)
+# Version mismatch detected → optionally refresh the systemd service
 ```
 
 ## 🏗️ Architecture
 
-TSPM uses a three-tier architecture for maximum reliability:
+TSPM uses a clean three-tier architecture:
 
-1. **ProcessWrapper** - Low-level process management with stream handling
-2. **ProcessMonitor** - Adds monitoring, memory limits, and auto-restart logic
-3. **Tspm Core** - High-level orchestration with configuration persistence
+```
+┌─────────────────────────────────────────┐
+│            CLI Interface                │
+│         (tspm commands)                 │
+└────────────────┬────────────────────────┘
+                 │ Unix Socket IPC
+┌────────────────▼────────────────────────┐
+│          TSPM Daemon                    │
+│     (Background Service)                │
+│  ┌──────────────────────────────────┐  │
+│  │     ProcessManager               │  │
+│  │  - Configuration persistence     │  │
+│  │  - Process lifecycle             │  │
+│  │  - Desired state management      │  │
+│  └────────────┬─────────────────────┘  │
+│               │                         │
+│  ┌────────────▼─────────────────────┐  │
+│  │     ProcessMonitor                │  │
+│  │  - Memory tracking & limits      │  │
+│  │  - Auto-restart logic            │  │
+│  │  - Log persistence (10MB)        │  │
+│  │  - File watching                 │  │
+│  └────────────┬─────────────────────┘  │
+│               │                         │
+│  ┌────────────▼─────────────────────┐  │
+│  │     ProcessWrapper                │  │
+│  │  - Process spawning              │  │
+│  │  - Stream handling               │  │
+│  │  - Signal management             │  │
+│  └──────────────────────────────────┘  │
+│                                         │
+│  ┌──────────────────────────────────┐  │
+│  │     CrashLogManager              │  │
+│  │  - Crash report generation       │  │
+│  │  - Log rotation (max 100)        │  │
+│  └──────────────────────────────────┘  │
+└─────────────────────────────────────────┘
+```
 
-The daemon architecture ensures your processes keep running even after you close your terminal. All process communication happens through a robust IPC (Inter-Process Communication) system.
+### Key Components
 
-## 🎮 Programmatic Usage
+| Component | Role |
+|-----------|------|
+| **CLI** | Lightweight client that sends commands to daemon via IPC |
+| **Daemon** | Persistent background service managing all processes |
+| **ProcessManager** | High-level orchestration, config persistence, state management |
+| **ProcessMonitor** | Memory limits, auto-restart with backoff, log persistence, file watching |
+| **ProcessWrapper** | Low-level process lifecycle, stream handling, signal management |
+| **CrashLogManager** | Detailed crash reports with metadata and log history |
 
-TSPM can also be used as a library in your Node.js applications:
+## 🎮 Programmatic API
+
+TSPM exposes a typed IPC client for programmatic use:
 
 ```typescript
-import { Tspm } from '@git.zone/tspm';
+import { TspmIpcClient } from '@git.zone/tspm/client';
 
-const manager = new Tspm();
+const client = new TspmIpcClient();
+await client.connect();
 
-// Start a process
-const processId = await manager.start({
-  id: 'worker',
-  name: 'Background Worker',
-  command: 'node worker.js',
-  projectDir: process.cwd(),
-  memoryLimitBytes: 512 * 1024 * 1024, // 512MB
-  autorestart: true,
-  watch: false,
+// Add a process configuration
+const { id } = await client.request('add', {
+  config: {
+    command: 'node worker.js',
+    name: 'background-worker',
+    projectDir: process.cwd(),
+    memoryLimitBytes: 512 * 1024 * 1024,
+    autorestart: true,
+  },
 });
 
-// Monitor process
-const info = await manager.getProcessInfo(processId);
-console.log(`Process ${info.id} is ${info.status}`);
+// Start it
+await client.request('startById', { id });
 
-// Stop process
-await manager.stop(processId);
+// Get process info
+const { processInfo } = await client.request('describe', { id });
+console.log(`Status: ${processInfo.status}, Memory: ${processInfo.memory} bytes`);
+
+// Get logs
+const { logs } = await client.request('getLogs', { id, limit: 100 });
+logs.forEach(log => console.log(`[${log.timestamp}] [${log.type}] ${log.message}`));
+
+// Stop and remove
+await client.request('stop', { id });
+await client.request('delete', { id });
+await client.disconnect();
 ```
 
+### Module Exports
+
+| Export Path | Purpose |
+|-------------|---------|
+| `@git.zone/tspm` | Main entry point (re-exports client + daemon) |
+| `@git.zone/tspm/client` | IPC client (`TspmIpcClient`, `TspmServiceManager`) |
+| `@git.zone/tspm/daemon` | Daemon entry point (`startDaemon`) |
+| `@git.zone/tspm/protocol` | IPC type definitions |
+
 ## 🔧 Advanced Features
 
-### Memory Limit Enforcement
+### Restart Backoff & Failure Handling
 
-TSPM tracks memory usage including all child processes spawned by your application. When a process exceeds its memory limit, it's gracefully restarted.
+TSPM handles crashed processes with intelligent backoff:
 
-### Process Group Tracking
+- **Incremental delay**: Grows linearly from 1s up to 10s for consecutive restarts
+- **Failure threshold**: After 10 consecutive failures, the process is marked `errored` and auto-restart stops
+- **Auto-reset**: The retry counter resets if no failure occurs for 1 hour
+- **Manual recovery**: `tspm restart id:1` always works, even on errored processes
 
-Using `ps-tree`, TSPM monitors not just your main process but all child processes it spawns, ensuring complete cleanup on stop/restart.
+### Memory Management
 
-### Intelligent Logging
+Full process tree memory tracking:
 
-Logs are buffered and managed efficiently, preventing memory issues from excessive output while ensuring you don't lose important information.
+- Discovers all child processes via `ps-tree`
+- Calculates combined memory usage across the entire tree
+- Gracefully restarts when limit is exceeded (SIGTERM → SIGKILL)
+- Prevents memory leaks from taking down production systems
+
+### Log Persistence
+
+Smart in-memory log management:
+
+- 10MB ring buffer per process with automatic trimming
+- Flushes to disk on stop, restart, or crash
+- Reloads persisted logs when process restarts
+- Crash logs stored separately with full metadata (exit code, signal, memory, timestamps)
 
 ### Graceful Shutdown
 
-Processes receive SIGTERM first, allowing them to clean up. After a timeout, SIGKILL ensures termination.
+Multi-stage shutdown for reliability:
 
-### Configuration Persistence
+1. Send **SIGTERM** for graceful shutdown
+2. Wait **5 seconds** for process cleanup
+3. Send **SIGKILL** if still alive
+4. Clean up **all child processes** in the tree
 
-Process configurations are saved, allowing you to restart all processes after a system reboot with a single command.
+### File Watching
 
-## 🛠️ Development
+Development-friendly auto-restart:
 
-```bash
-# Clone the repository
-git clone https://code.foss.global/git.zone/tspm.git
-
-# Install dependencies
-pnpm install
-
-# Run tests
-pnpm test
-
-# Build the project
-pnpm build
-
-# Start development
-pnpm start
-```
+- Watch specific directories or files
+- `node_modules` ignored by default
+- Debounced restart on file changes
+- Configurable via `--watch-paths`
 
 ## 🐛 Debugging
 
-Enable debug mode for verbose logging:
-
 ```bash
-export TSPM_DEBUG=true
-tspm list
+# Check daemon status
+tspm daemon status
+
+# View process logs
+tspm logs name:my-app --lines 200
+
+# Check daemon stderr
+tail -f /tmp/daemon-stderr.log
+
+# Force daemon restart
+tspm daemon restart
 ```
 
-## 📊 Performance
+**Common issues:**
 
-TSPM is designed to be lightweight and efficient:
-
-- Minimal CPU overhead (typically < 0.5%)
-- Small memory footprint (~30-50MB for the daemon)
-- Fast process startup and shutdown
-- Efficient log buffering and rotation
+| Problem | Solution |
+|---------|----------|
+| "Daemon not running" | `tspm daemon start` or `sudo tspm enable` |
+| "Permission denied" | Check socket permissions in `~/.tspm/` |
+| Process won't start | Check logs with `tspm logs <target>` |
+| Memory limit exceeded | Increase with `tspm edit <target>` |
 
 ## 🤝 Why TSPM?
 
-Unlike general-purpose process managers, TSPM is built specifically for the TypeScript/Node.js ecosystem:
+| Feature | TSPM | PM2 |
+|---------|------|-----|
+| TypeScript Native | ✅ Built in TypeScript | ❌ JavaScript |
+| Memory Tracking | ✅ Full process tree | ⚠️ Main process only |
+| Log Management | ✅ Smart 10MB buffer | ⚠️ Can grow unbounded |
+| Architecture | ✅ Clean 3-tier daemon | ❌ Monolithic |
+| Dependencies | ✅ Minimal | ❌ Heavy |
+| ESM Support | ✅ Native | ⚠️ Partial |
+| Crash Reports | ✅ Detailed with metadata | ❌ Basic |
 
-- **TypeScript First** - Written in TypeScript, for TypeScript projects
-- **ESM Native** - Full support for ES modules
-- **Developer Friendly** - Beautiful CLI output and helpful error messages
-- **Production Ready** - Battle-tested memory management and error handling
-- **No Configuration Required** - Sensible defaults that just work
-- **Modern Architecture** - Async/await throughout, no callback hell
+### Perfect For
+
+- 🚀 **Production Node.js apps** — Reliable process management with memory guards
+- 🔧 **Microservices** — Manage multiple services from a single tool
+- 👨‍💻 **Development** — File watching and instant auto-restart
+- 🏭 **Workers & Jobs** — Queue workers, cron jobs, background tasks
+- 📊 **Resource-constrained environments** — Memory limits prevent OOM kills
 
 ## License and Legal Information
 
-This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository.
+This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](./license) file.
 
 **Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
 
 ### Trademarks
 
-This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
+This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH or third parties, and are not included within the scope of the MIT license granted herein.
+
+Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines or the guidelines of the respective third-party owners, and any usage must be approved in writing. Third-party trademarks used herein are the property of their respective owners and used only in a descriptive manner, e.g. for an implementation of an API or similar.
 
 ### Company Information
 
 Task Venture Capital GmbH
-Registered at District court Bremen HRB 35230 HB, Germany
+Registered at District Court Bremen HRB 35230 HB, Germany
 
-For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
+For any legal inquiries or further information, please contact us via email at hello@task.vc.
 
 By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.

test/test.crashlog.direct.ts

@@ -0,0 +1,90 @@
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import { CrashLogManager } from '../ts/daemon/crashlogmanager.js';
+import type { IProcessLog } from '../ts/shared/protocol/ipc.types.js';
+import * as plugins from '../ts/plugins.js';
+import * as paths from '../ts/paths.js';
+import * as fs from 'fs/promises';
+
+tap.test('CrashLogManager should save and read crash logs', async () => {
+  const crashLogManager = new CrashLogManager();
+  const crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
+
+  // Clean up any existing crash logs
+  try {
+    await fs.rm(crashLogsDir, { recursive: true, force: true });
+  } catch {}
+
+  // Create test logs
+  const testLogs: IProcessLog[] = [
+    { timestamp: Date.now() - 5000, message: '[TEST] Process starting up...', type: 'stdout' },
+    { timestamp: Date.now() - 4000, message: '[TEST] Initializing components...', type: 'stdout' },
+    { timestamp: Date.now() - 3000, message: '[TEST] Running main loop...', type: 'stdout' },
+    { timestamp: Date.now() - 2000, message: '[TEST] Warning: Memory usage high', type: 'stderr' },
+    { timestamp: Date.now() - 1000, message: '[TEST] Error: Unhandled exception occurred!', type: 'stderr' },
+    { timestamp: Date.now() - 500, message: '[TEST] Fatal: Process crashing with exit code 42', type: 'stderr' }
+  ];
+
+  // Test saving a crash log
+  await crashLogManager.saveCrashLog(
+    1 as any,
+    'test-process',
+    testLogs,
+    42,
+    null,
+    3,
+    1024 * 1024 * 50
+  );
+
+  // Check if crash log was created
+  const crashLogFiles = await fs.readdir(crashLogsDir).catch(() => []);
+  expect(crashLogFiles.length).toBeGreaterThan(0);
+
+  // Read and verify content
+  const crashLogFile = crashLogFiles[0];
+  const crashLogPath = plugins.path.join(crashLogsDir, crashLogFile);
+  const crashLogContent = await fs.readFile(crashLogPath, 'utf-8');
+
+  expect(crashLogContent).toInclude('CRASH REPORT');
+  expect(crashLogContent).toInclude('Exit Code:       42');
+  expect(crashLogContent).toInclude('Restart Attempt: 3/10');
+  expect(crashLogContent).toInclude('Memory Usage:    50 MB');
+  expect(crashLogContent).toInclude('Fatal: Process crashing');
+});
+
+tap.test('CrashLogManager should rotate old logs at 100 limit', async () => {
+  const crashLogManager = new CrashLogManager();
+  const crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
+
+  // Clean up
+  try {
+    await fs.rm(crashLogsDir, { recursive: true, force: true });
+  } catch {}
+
+  const testLogs: IProcessLog[] = [
+    { timestamp: Date.now(), message: '[TEST] Test log', type: 'stdout' }
+  ];
+
+  // Create 105 crash logs to test rotation
+  for (let i = 1; i <= 105; i++) {
+    await crashLogManager.saveCrashLog(
+      i as any,
+      `test-process-${i}`,
+      testLogs,
+      i,
+      null,
+      1,
+      1024 * 1024 * 10
+    );
+    await new Promise(resolve => setTimeout(resolve, 10));
+  }
+
+  // Check that we have exactly 100 logs (rotation working)
+  const finalLogFiles = await fs.readdir(crashLogsDir);
+  expect(finalLogFiles.length).toEqual(100);
+
+  // Verify oldest logs were deleted
+  const hasFirstLog = finalLogFiles.some(f => f.includes('_1_test-process-1.log'));
+  expect(hasFirstLog).toBeFalse();
+});
+
+export default tap.start();

test/test.crashlog.manual.ts

@@ -0,0 +1,107 @@
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import * as plugins from '../ts/plugins.js';
+import * as paths from '../ts/paths.js';
+import * as fs from 'fs/promises';
+import { execSync } from 'child_process';
+
+// Test process that will crash
+const CRASH_SCRIPT = `
+setInterval(() => {
+  console.log('[test] Process is running...');
+}, 1000);
+
+setTimeout(() => {
+  console.error('[test] About to crash with non-zero exit code!');
+  process.exit(42);
+}, 3000);
+`;
+
+tap.test('manual crash log test via CLI', async (tools) => {
+  const crashScriptPath = plugins.path.join(paths.tspmDir, 'test-crash-script.js');
+  const crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
+
+  // Clean up any existing crash logs
+  try {
+    await fs.rm(crashLogsDir, { recursive: true, force: true });
+  } catch {}
+
+  // Write the crash script
+  await fs.writeFile(crashScriptPath, CRASH_SCRIPT);
+
+  // Stop any existing daemon
+  try {
+    execSync('tsx ts/cli.ts daemon stop', { stdio: 'pipe' });
+  } catch {}
+  await tools.delayFor(1000);
+
+  // Start the daemon
+  console.log('Starting daemon...');
+  try {
+    execSync('tsx ts/cli.ts daemon start', { stdio: 'pipe' });
+  } catch {}
+  await tools.delayFor(2000);
+
+  // Add a process that will crash
+  console.log('Adding crash test process...');
+  let addOutput: string;
+  try {
+    addOutput = execSync(`tsx ts/cli.ts add "node ${crashScriptPath}" --name crash-test`, { encoding: 'utf-8', stdio: 'pipe' });
+  } catch (e: any) {
+    addOutput = e.stdout || '';
+  }
+  console.log(addOutput);
+
+  // Extract process ID from output
+  const idMatch = addOutput.match(/Assigned ID: (\d+)/i)
+    || addOutput.match(/id[:\s]+(\d+)/i);
+
+  if (!idMatch) {
+    console.log('Could not extract process ID, skipping rest of test');
+    // Clean up
+    try { execSync('tsx ts/cli.ts daemon stop', { stdio: 'pipe' }); } catch {}
+    await fs.unlink(crashScriptPath).catch(() => {});
+    return;
+  }
+
+  const processId = parseInt(idMatch[1]);
+  console.log(`Process ID: ${processId}`);
+
+  // Start the process
+  console.log('Starting process that will crash...');
+  try {
+    execSync(`tsx ts/cli.ts start ${processId}`, { stdio: 'pipe' });
+  } catch {}
+
+  // Wait for the process to crash (it crashes after 3 seconds)
+  console.log('Waiting for process to crash...');
+  await tools.delayFor(5000);
+
+  // Check if crash log was created
+  console.log('Checking for crash log...');
+  const crashLogFiles = await fs.readdir(crashLogsDir).catch(() => []);
+  console.log(`Found ${crashLogFiles.length} crash log files:`);
+  crashLogFiles.forEach(file => console.log(`  - ${file}`));
+
+  expect(crashLogFiles.length).toBeGreaterThan(0);
+
+  // Find and verify crash log
+  const testCrashLog = crashLogFiles.find(file => file.includes('crash-test'));
+  if (testCrashLog) {
+    const crashLogPath = plugins.path.join(crashLogsDir, testCrashLog);
+    const crashLogContent = await fs.readFile(crashLogPath, 'utf-8');
+
+    console.log('\nCrash log content:');
+    console.log(crashLogContent);
+
+    expect(crashLogContent).toInclude('CRASH REPORT');
+    expect(crashLogContent).toInclude('Exit Code');
+  }
+
+  // Clean up
+  console.log('Cleaning up...');
+  try { execSync(`tsx ts/cli.ts delete ${processId}`, { stdio: 'pipe' }); } catch {}
+  try { execSync('tsx ts/cli.ts daemon stop', { stdio: 'pipe' }); } catch {}
+  await fs.unlink(crashScriptPath).catch(() => {});
+});
+
+export default tap.start();

test/test.crashlog.ts

@@ -0,0 +1,202 @@
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import * as plugins from '../ts/plugins.js';
+import * as paths from '../ts/paths.js';
+import * as fs from 'fs/promises';
+import { execSync } from 'child_process';
+
+// Import tspm client
+import { tspmIpcClient } from '../ts/client/tspm.ipcclient.js';
+
+// Test process that will crash
+const CRASH_SCRIPT = `
+setInterval(() => {
+  console.log('[test] Process is running...');
+}, 1000);
+
+setTimeout(() => {
+  console.error('[test] About to crash with non-zero exit code!');
+  process.exit(42);
+}, 3000);
+`;
+
+/**
+ * Helper to run a CLI command and capture output
+ */
+function runCli(cmd: string): { stdout: string; stderr: string; exitCode: number } {
+  try {
+    const stdout = execSync(cmd, { encoding: 'utf-8', stdio: 'pipe' });
+    return { stdout, stderr: '', exitCode: 0 };
+  } catch (e: any) {
+    return {
+      stdout: e.stdout?.toString() || '',
+      stderr: e.stderr?.toString() || '',
+      exitCode: e.status ?? 1,
+    };
+  }
+}
+
+tap.test('should create crash logs when process crashes', async (tools) => {
+  const crashScriptPath = plugins.path.join(paths.tspmDir, 'test-crash-script.js');
+  const crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
+
+  // Clean up any existing crash logs
+  try {
+    await fs.rm(crashLogsDir, { recursive: true, force: true });
+  } catch {}
+
+  // Write the crash script
+  await fs.writeFile(crashScriptPath, CRASH_SCRIPT);
+
+  // Stop any existing daemon first
+  runCli('tsx ts/cli.ts daemon stop');
+  await tools.delayFor(1000);
+
+  // Start the daemon
+  console.log('Starting daemon...');
+  const daemonResult = runCli('tsx ts/cli.ts daemon start');
+  console.log('Daemon start output:', daemonResult.stdout, daemonResult.stderr);
+
+  // Wait for daemon to be ready
+  await tools.delayFor(3000);
+
+  // Add a process that will crash
+  console.log('Adding crash test process...');
+  const addResult = runCli(`tsx ts/cli.ts add "node ${crashScriptPath}" --name crash-test`);
+  console.log('Add output:', addResult.stdout, addResult.stderr);
+
+  // Extract process ID from output
+  const idMatch = addResult.stdout.match(/Assigned ID:\s*(\d+)/);
+  if (!idMatch) {
+    console.log('Could not extract process ID from output, skipping integration test');
+    runCli('tsx ts/cli.ts daemon stop');
+    await fs.unlink(crashScriptPath).catch(() => {});
+    return;
+  }
+  const processId = parseInt(idMatch[1]);
+  console.log(`Process ID: ${processId}`);
+
+  // Start the process
+  console.log('Starting process that will crash...');
+  runCli(`tsx ts/cli.ts start ${processId}`);
+
+  // Wait for the process to crash (it crashes after 3 seconds)
+  console.log('Waiting for process to crash...');
+  await tools.delayFor(5000);
+
+  // Check if crash log was created
+  console.log('Checking for crash log...');
+  const crashLogFiles = await fs.readdir(crashLogsDir).catch(() => []);
+  console.log(`Found ${crashLogFiles.length} crash log files:`, crashLogFiles);
+
+  // Should have at least one crash log
+  expect(crashLogFiles.length).toBeGreaterThan(0);
+
+  // Find the crash log for our test process
+  const testCrashLog = crashLogFiles.find(file => file.includes('crash-test'));
+  expect(testCrashLog).toBeTruthy();
+
+  // Read and verify crash log content
+  const crashLogPath = plugins.path.join(crashLogsDir, testCrashLog!);
+  const crashLogContent = await fs.readFile(crashLogPath, 'utf-8');
+
+  console.log('Crash log content:');
+  console.log(crashLogContent);
+
+  // Verify crash log contains expected information
+  expect(crashLogContent).toInclude('CRASH REPORT');
+  expect(crashLogContent).toInclude('Exit Code');
+  expect(crashLogContent).toInclude('About to crash');
+
+  // Stop the process and daemon
+  console.log('Cleaning up...');
+  runCli(`tsx ts/cli.ts delete ${processId}`);
+  runCli('tsx ts/cli.ts daemon stop');
+
+  // Clean up test file
+  await fs.unlink(crashScriptPath).catch(() => {});
+});
+
+tap.test('should create crash logs when process is killed', async (tools) => {
+  const killScriptPath = plugins.path.join(paths.tspmDir, 'test-kill-script.js');
+  const crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
+
+  // Write a script that runs indefinitely
+  const KILL_SCRIPT = `
+setInterval(() => {
+  console.log('[test] Process is running and will be killed...');
+}, 500);
+`;
+
+  await fs.writeFile(killScriptPath, KILL_SCRIPT);
+
+  // Stop any existing daemon
+  runCli('tsx ts/cli.ts daemon stop');
+  await tools.delayFor(1000);
+
+  // Start the daemon
+  console.log('Starting daemon...');
+  runCli('tsx ts/cli.ts daemon start');
+
+  // Wait for daemon to be ready
+  await tools.delayFor(3000);
+
+  // Add a process that we'll kill
+  console.log('Adding kill test process...');
+  const addResult = runCli(`tsx ts/cli.ts add "node ${killScriptPath}" --name kill-test`);
+  console.log('Add output:', addResult.stdout, addResult.stderr);
+
+  // Extract process ID
+  const idMatch = addResult.stdout.match(/Assigned ID:\s*(\d+)/);
+  if (!idMatch) {
+    console.log('Could not extract process ID from output, skipping integration test');
+    runCli('tsx ts/cli.ts daemon stop');
+    await fs.unlink(killScriptPath).catch(() => {});
+    return;
+  }
+  const processId = parseInt(idMatch[1]);
+
+  // Start the process
+  console.log('Starting process to be killed...');
+  runCli(`tsx ts/cli.ts start ${processId}`);
+
+  // Wait for process to run a bit
+  await tools.delayFor(2000);
+
+  // Get the actual PID of the running process
+  const statusResult = runCli(`tsx ts/cli.ts describe ${processId}`);
+  const pidMatch = statusResult.stdout.match(/pid:\s+(\d+)/);
+
+  if (pidMatch) {
+    const pid = parseInt(pidMatch[1]);
+    console.log(`Killing process with PID ${pid}...`);
+
+    // Kill the process with SIGTERM
+    runCli(`kill -TERM ${pid}`);
+
+    // Wait for crash log to be created
+    await tools.delayFor(3000);
+
+    // Check for crash log
+    console.log('Checking for crash log from killed process...');
+    const crashLogFiles = await fs.readdir(crashLogsDir).catch(() => []);
+    const killCrashLog = crashLogFiles.find(file => file.includes('kill-test'));
+
+    if (killCrashLog) {
+      const crashLogPath = plugins.path.join(crashLogsDir, killCrashLog);
+      const crashLogContent = await fs.readFile(crashLogPath, 'utf-8');
+
+      console.log('Kill crash log content:');
+      console.log(crashLogContent);
+
+      expect(crashLogContent).toInclude('SIGTERM');
+    }
+  }
+
+  // Clean up
+  console.log('Cleaning up...');
+  runCli(`tsx ts/cli.ts delete ${processId}`);
+  runCli('tsx ts/cli.ts daemon stop');
+  await fs.unlink(killScriptPath).catch(() => {});
+});
+
+export default tap.start();

test/test.integration.ts

@@ -5,6 +5,7 @@ import * as fs from 'fs/promises';
 import * as os from 'os';
 import { spawn } from 'child_process';
 import { tspmIpcClient, TspmIpcClient } from '../ts/client/tspm.ipcclient.js';
+import { toProcessId } from '../ts/shared/protocol/id.js';
 
 // Helper to ensure daemon is stopped before tests
 async function ensureDaemonStopped() {
@@ -160,7 +161,7 @@ tap.test('Process management through daemon', async (tools) => {
 
   // Test 2: Start a test process
   const testConfig: tspm.IProcessConfig = {
-    id: 'test-echo',
+    id: toProcessId(1001),
     name: 'Test Echo Process',
     command: 'echo "Test process"',
     projectDir: process.cwd(),
@@ -172,7 +173,7 @@ tap.test('Process management through daemon', async (tools) => {
     config: testConfig,
   });
   console.log('Start response:', startResponse);
-  expect(startResponse.processId).toEqual('test-echo');
+  expect(startResponse.processId).toEqual(1001);
   expect(startResponse.status).toBeDefined();
 
   // Test 3: List processes (should have one process)
@@ -180,27 +181,27 @@ tap.test('Process management through daemon', async (tools) => {
   console.log('List after start:', listResponse);
   expect(listResponse.processes.length).toBeGreaterThanOrEqual(1);
 
-  const procInfo = listResponse.processes.find((p) => p.id === 'test-echo');
+  const procInfo = listResponse.processes.find((p) => p.id === toProcessId(1001));
   expect(procInfo).toBeDefined();
-  expect(procInfo?.id).toEqual('test-echo');
+  expect(procInfo?.id).toEqual(1001);
 
   // Test 4: Describe the process
   const describeResponse = await tspmIpcClient.request('describe', {
-    id: 'test-echo',
+    id: toProcessId(1001),
   });
   console.log('Describe:', describeResponse);
   expect(describeResponse.processInfo).toBeDefined();
   expect(describeResponse.config).toBeDefined();
-  expect(describeResponse.config.id).toEqual('test-echo');
+  expect(describeResponse.config.id).toEqual(1001);
 
   // Test 5: Stop the process
-  const stopResponse = await tspmIpcClient.request('stop', { id: 'test-echo' });
+  const stopResponse = await tspmIpcClient.request('stop', { id: toProcessId(1001) });
   console.log('Stop response:', stopResponse);
   expect(stopResponse.success).toEqual(true);
 
   // Test 6: Delete the process
   const deleteResponse = await tspmIpcClient.request('delete', {
-    id: 'test-echo',
+    id: toProcessId(1001),
   });
   console.log('Delete response:', deleteResponse);
   expect(deleteResponse.success).toEqual(true);
@@ -208,9 +209,7 @@ tap.test('Process management through daemon', async (tools) => {
   // Test 7: Verify process is gone
   listResponse = await tspmIpcClient.request('list', {});
   console.log('List after delete:', listResponse);
-  const deletedProcess = listResponse.processes.find(
-    (p) => p.id === 'test-echo',
-  );
+  const deletedProcess = listResponse.processes.find((p) => p.id === toProcessId(1001));
   expect(deletedProcess).toBeUndefined();
 
   // Cleanup: stop daemon
@@ -241,7 +240,7 @@ tap.test('Batch operations through daemon', async (tools) => {
   // Add multiple test processes
   const testConfigs: tspm.IProcessConfig[] = [
     {
-      id: 'batch-test-1',
+      id: toProcessId(1101),
       name: 'Batch Test 1',
       command: 'echo "Process 1"',
       projectDir: process.cwd(),
@@ -249,7 +248,7 @@ tap.test('Batch operations through daemon', async (tools) => {
       autorestart: false,
     },
     {
-      id: 'batch-test-2',
+      id: toProcessId(1102),
       name: 'Batch Test 2',
       command: 'echo "Process 2"',
       projectDir: process.cwd(),
@@ -308,7 +307,7 @@ tap.test('Daemon error handling', async (tools) => {
 
   // Test 1: Try to stop non-existent process
   try {
-    await tspmIpcClient.request('stop', { id: 'non-existent-process' });
+    await tspmIpcClient.request('stop', { id: toProcessId(99999) });
     expect(false).toEqual(true); // Should not reach here
   } catch (error) {
     expect(error.message).toInclude('Failed to stop process');
@@ -316,7 +315,7 @@ tap.test('Daemon error handling', async (tools) => {
 
   // Test 2: Try to describe non-existent process
   try {
-    await tspmIpcClient.request('describe', { id: 'non-existent-process' });
+    await tspmIpcClient.request('describe', { id: toProcessId(99999) });
     expect(false).toEqual(true); // Should not reach here
   } catch (error) {
     expect(error.message).toInclude('not found');
@@ -324,7 +323,7 @@ tap.test('Daemon error handling', async (tools) => {
 
   // Test 3: Try to restart non-existent process
   try {
-    await tspmIpcClient.request('restart', { id: 'non-existent-process' });
+    await tspmIpcClient.request('restart', { id: toProcessId(99999) });
     expect(false).toEqual(true); // Should not reach here
   } catch (error) {
     expect(error.message).toInclude('Failed to restart process');

test/test.ts

@@ -1,5 +1,6 @@
 import { expect, tap } from '@git.zone/tstest/tapbundle';
 import * as tspm from '../ts/index.js';
+import { toProcessId } from '../ts/shared/protocol/id.js';
 import { join } from 'path';
 
 // Basic module import test
@@ -51,7 +52,7 @@ async function exampleUsingIpcClient() {
   // Start a process using the request method
   await client.request('start', {
     config: {
-      id: 'web-server',
+      id: toProcessId(2001),
       name: 'Web Server',
       projectDir: '/path/to/web/project',
       command: 'npm run serve',
@@ -65,7 +66,7 @@ async function exampleUsingIpcClient() {
   // Start another process
   await client.request('start', {
     config: {
-      id: 'api-server',
+      id: toProcessId(2002),
       name: 'API Server',
       projectDir: '/path/to/api/project',
       command: 'npm run api',
@@ -80,13 +81,13 @@ async function exampleUsingIpcClient() {
   
   // Get logs from a process
   const logs = await client.request('getLogs', {
-    id: 'web-server',
+    id: toProcessId(2001),
     lines: 20,
   });
   console.log('Web server logs:', logs.logs);
   
   // Stop a process
-  await client.request('stop', { id: 'api-server' });
+  await client.request('stop', { id: toProcessId(2002) });
   
   // Handle graceful shutdown
   process.on('SIGINT', async () => {

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/tspm',
-  version: '4.0.0',
+  version: '5.10.4',
   description: 'a no fuzz process manager'
 }

ts/cli/commands/batch/restart-all.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { registerIpcCommand } from '../../registration/index.js';

ts/cli/commands/batch/start-all.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { registerIpcCommand } from '../../registration/index.js';

ts/cli/commands/batch/stop-all.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { registerIpcCommand } from '../../registration/index.js';

ts/cli/commands/daemon/index.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import * as paths from '../../../paths.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import { Logger } from '../../../shared/common/utils.errorhandler.js';
@@ -33,7 +33,8 @@ export function registerDaemonCommand(smartcli: plugins.smartcli.Smartcli) {
             const daemonScript = plugins.path.join(
               paths.packageDir,
               'dist_ts',
-              'daemon.js',
+              'daemon',
+              'tspm.daemon.js',
             );
 
             // Start daemon as a detached background process
@@ -80,6 +81,48 @@ export function registerDaemonCommand(smartcli: plugins.smartcli.Smartcli) {
           }
           break;
 
+        case 'restart':
+          try {
+            console.log('Restarting TSPM daemon...');
+            await tspmIpcClient.stopDaemon(true);
+
+            // Reuse the manual start logic from 'start'
+            const statusAfterStop = await tspmIpcClient.getDaemonStatus();
+            if (statusAfterStop) {
+              console.warn('Daemon still appears to be running; proceeding to start anyway.');
+            }
+
+            console.log('Starting TSPM daemon manually...');
+            const { spawn } = await import('child_process');
+            const daemonScript = plugins.path.join(
+              paths.packageDir,
+              'dist_ts',
+              'daemon.js',
+            );
+            const daemonProcess = spawn(process.execPath, [daemonScript], {
+              detached: true,
+              stdio: process.env.TSPM_DEBUG === 'true' ? 'inherit' : 'ignore',
+              env: { ...process.env, TSPM_DAEMON_MODE: 'true' },
+            });
+            daemonProcess.unref();
+            console.log(`Started daemon with PID: ${daemonProcess.pid}`);
+
+            await new Promise((resolve) => setTimeout(resolve, 2000));
+            const newStatus = await tspmIpcClient.getDaemonStatus();
+            if (newStatus) {
+              console.log('✓ TSPM daemon restarted successfully');
+              console.log(`  PID: ${newStatus.pid}`);
+            } else {
+              console.warn('\n⚠️  Warning: Daemon restart attempted but status is unavailable.');
+            }
+
+            await tspmIpcClient.disconnect();
+          } catch (error) {
+            console.error('Error restarting daemon:', (error as any).message || String(error));
+            process.exit(1);
+          }
+          break;
+
         case 'start-service':
           // This is called by systemd - start the daemon directly
           console.log('Starting TSPM daemon for systemd service...');
@@ -135,6 +178,7 @@ export function registerDaemonCommand(smartcli: plugins.smartcli.Smartcli) {
           console.log('Usage: tspm daemon <command>');
           console.log('\nCommands:');
           console.log('  start   Start the TSPM daemon');
+          console.log('  restart Restart the TSPM daemon');
           console.log('  stop    Stop the TSPM daemon');
           console.log('  status  Show daemon status');
           break;

ts/cli/commands/default.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../plugins.js';
+import * as plugins from '../plugins.js';
 import * as paths from '../../paths.js';
 import { tspmIpcClient } from '../../client/tspm.ipcclient.js';
 import { Logger } from '../../shared/common/utils.errorhandler.js';
@@ -22,13 +22,14 @@ export function registerDefaultCommand(smartcli: plugins.smartcli.Smartcli) {
       );
       console.log('  disable                  Disable TSPM system service');
       console.log('\nProcess Commands:');
-      console.log('  start <script>           Start a process');
+      console.log('  start <id|id:N|name:LBL> Start a process');
       console.log('  list                     List all processes');
-      console.log('  stop <id>                Stop a process');
-      console.log('  restart <id>             Restart a process');
-      console.log('  delete <id>              Delete a process');
-      console.log('  describe <id>            Show details for a process');
-      console.log('  logs <id>                Show logs for a process');
+      console.log('  stop <id|id:N|name:LBL>  Stop a process');
+      console.log('  restart <id|id:N|name:LBL> Restart a process');
+      console.log('  delete <id|id:N|name:LBL> Delete a process');
+      console.log('  describe <id|id:N|name:LBL> Show details for a process');
+      console.log('  logs <id|id:N|name:LBL>  Show logs for a process');
+      console.log('  search <query>           Find processes by id/name');
       console.log('  start-all                Start all saved processes');
       console.log('  stop-all                 Stop all processes');
       console.log('  restart-all              Restart all processes');
@@ -38,6 +39,7 @@ export function registerDefaultCommand(smartcli: plugins.smartcli.Smartcli) {
       );
       console.log('  daemon stop              Stop the daemon');
       console.log('  daemon status            Show daemon status');
+      console.log('  stats                    Show daemon + process stats');
       console.log(
         '\nUse tspm [command] --help for more information about a command.',
       );
@@ -74,7 +76,7 @@ export function registerDefaultCommand(smartcli: plugins.smartcli.Smartcli) {
             const resetColor = '\x1b[0m';
 
             console.log(
-              `│ ${pad(proc.id, 7)} │ ${pad(proc.id, 11)} │ ${statusColor}${pad(proc.status, 9)}${resetColor} │ ${pad(formatMemory(proc.memory), 9)} │ ${pad(proc.restarts.toString(), 8)} │`,
+              `│ ${pad(String(proc.id), 7)} │ ${pad(String(proc.id), 11)} │ ${statusColor}${pad(proc.status, 9)}${resetColor} │ ${pad(formatMemory(proc.memory), 9)} │ ${pad(proc.restarts.toString(), 8)} │`,
             );
           }
 

ts/cli/commands/process/add.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { parseMemoryString, formatMemory } from '../../helpers/memory.js';
@@ -20,6 +20,7 @@ export function registerAddCommand(smartcli: plugins.smartcli.Smartcli) {
         console.log('  --watch               Watch for file changes');
         console.log('  --watch-paths <paths> Comma-separated paths');
         console.log('  --autorestart         Auto-restart on crash (default true)');
+        console.log('  -i, --interactive     Enter interactive edit mode after adding');
         return;
       }
 
@@ -29,6 +30,9 @@ export function registerAddCommand(smartcli: plugins.smartcli.Smartcli) {
         ? parseMemoryString(argvArg.memory)
         : 512 * 1024 * 1024;
 
+      // Check for interactive flag
+      const isInteractive = argvArg.i || argvArg.interactive;
+
       // Resolve .ts single-file execution via tsx if needed
       const parts = script.split(' ');
       const first = parts[0];
@@ -69,6 +73,33 @@ export function registerAddCommand(smartcli: plugins.smartcli.Smartcli) {
         if (watchPaths) console.log(`  Watch paths: ${watchPaths.join(',')}`);
       }
 
+      // Capture essential environment variables from the CLI environment
+      // so processes have access to the same environment they were added with
+      const essentialEnvVars: NodeJS.ProcessEnv = {
+        PATH: process.env.PATH || '',
+        HOME: process.env.HOME,
+        USER: process.env.USER,
+        SHELL: process.env.SHELL,
+        LANG: process.env.LANG,
+        LC_ALL: process.env.LC_ALL,
+        // Node.js specific
+        NODE_ENV: process.env.NODE_ENV,
+        NODE_PATH: process.env.NODE_PATH,
+        // npm/pnpm/yarn paths
+        npm_config_prefix: process.env.npm_config_prefix,
+        // Include any TSPM_ prefixed vars
+        ...Object.fromEntries(
+          Object.entries(process.env).filter(([key]) => key.startsWith('TSPM_'))
+        ),
+      };
+
+      // Remove undefined values
+      Object.keys(essentialEnvVars).forEach(key => {
+        if (essentialEnvVars[key] === undefined) {
+          delete essentialEnvVars[key];
+        }
+      });
+
       const response = await tspmIpcClient.request('add', {
         config: {
           name,
@@ -76,6 +107,7 @@ export function registerAddCommand(smartcli: plugins.smartcli.Smartcli) {
           args: cmdArgs,
           projectDir,
           memoryLimitBytes: memoryLimit,
+          env: essentialEnvVars,
           autorestart,
           watch,
           watchPaths,
@@ -84,8 +116,13 @@ export function registerAddCommand(smartcli: plugins.smartcli.Smartcli) {
 
       console.log('✓ Added');
       console.log(`  Assigned ID: ${response.id}`);
+
+      // If interactive flag is set, enter edit mode
+      if (isInteractive) {
+        const { interactiveEditProcess } = await import('../../helpers/interactive-edit.js');
+        await interactiveEditProcess(response.id);
+      }
     },
     { actionLabel: 'add process config' },
   );
 }
-

ts/cli/commands/process/delete.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { registerIpcCommand } from '../../registration/index.js';
@@ -8,23 +8,25 @@ export function registerDeleteCommand(smartcli: plugins.smartcli.Smartcli) {
     smartcli,
     ['delete', 'remove'],
     async (argvArg: CliArguments) => {
-      const id = argvArg._[1];
-      if (!id) {
-        console.error('Error: Please provide a process ID');
-        console.log('Usage: tspm delete <id> | tspm remove <id>');
+      const target = argvArg._[1];
+      if (!target) {
+        console.error('Error: Please provide a process target');
+        console.log('Usage: tspm delete <id|id:N|name:LABEL> | tspm remove <id|id:N|name:LABEL>');
         return;
       }
 
       // Determine if command was 'remove' to use the new IPC route, otherwise 'delete'
       const cmd = String(argvArg._[0]);
-      const useRemove = cmd === 'remove';
-      console.log(`${useRemove ? 'Removing' : 'Deleting'} process: ${id}`);
-      const response = await tspmIpcClient.request(useRemove ? 'remove' : 'delete', { id } as any);
+      const isRemoveAlias = cmd === 'remove';
+      console.log(`${isRemoveAlias ? 'Removing' : 'Deleting'} process: ${target}`);
+      const resolved = await tspmIpcClient.request('resolveTarget', { target: String(target) });
+      // Always call daemon 'delete'; 'remove' is CLI alias only
+      const response = await tspmIpcClient.request('delete', { id: resolved.id } as any);
 
       if (response.success) {
-        console.log(`✓ ${response.message || (useRemove ? 'Removed successfully' : 'Deleted successfully')}`);
+        console.log(`✓ ${response.message || (isRemoveAlias ? 'Removed successfully' : 'Deleted successfully')}`);
       } else {
-        console.error(`✗ Failed to ${useRemove ? 'remove' : 'delete'} process: ${response.message}`);
+        console.error(`✗ Failed to ${isRemoveAlias ? 'remove' : 'delete'} process: ${response.message}`);
       }
     },
     { actionLabel: 'delete/remove process' },

ts/cli/commands/process/describe.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { registerIpcCommand } from '../../registration/index.js';
@@ -9,16 +9,17 @@ export function registerDescribeCommand(smartcli: plugins.smartcli.Smartcli) {
     smartcli,
     'describe',
     async (argvArg: CliArguments) => {
-      const id = argvArg._[1];
-      if (!id) {
-        console.error('Error: Please provide a process ID');
-        console.log('Usage: tspm describe <id>');
+      const target = argvArg._[1];
+      if (!target) {
+        console.error('Error: Please provide a process target');
+        console.log('Usage: tspm describe <id | id:N | name:LABEL>');
         return;
       }
 
-      const response = await tspmIpcClient.request('describe', { id });
+      const resolved = await tspmIpcClient.request('resolveTarget', { target: String(target) });
+      const response = await tspmIpcClient.request('describe', { id: resolved.id });
 
-      console.log(`Process Details: ${id}`);
+      console.log(`Process Details: ${response.config.name || resolved.id}`);
       console.log('─'.repeat(40));
       console.log(`Status:      ${response.processInfo.status}`);
       console.log(`PID:         ${response.processInfo.pid || 'N/A'}`);

ts/cli/commands/process/edit.ts

@@ -0,0 +1,28 @@
+import * as plugins from '../../plugins.js';
+import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
+import type { CliArguments } from '../../types.js';
+import { registerIpcCommand } from '../../registration/index.js';
+import { formatMemory, parseMemoryString } from '../../helpers/memory.js';
+
+export function registerEditCommand(smartcli: plugins.smartcli.Smartcli) {
+  registerIpcCommand(
+    smartcli,
+    'edit',
+    async (argvArg: CliArguments) => {
+      const target = argvArg._[1];
+      if (!target) {
+        console.error('Error: Please provide a process target to edit');
+        console.log('Usage: tspm edit <id | id:N | name:LABEL>');
+        return;
+      }
+
+      // Resolve the target to get the process ID
+      const resolved = await tspmIpcClient.request('resolveTarget', { target: String(target) });
+      
+      // Use the shared interactive edit function
+      const { interactiveEditProcess } = await import('../../helpers/interactive-edit.js');
+      await interactiveEditProcess(resolved.id);
+    },
+    { actionLabel: 'edit process config' },
+  );
+}

ts/cli/commands/process/list.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { registerIpcCommand } from '../../registration/index.js';
@@ -14,19 +14,21 @@ export function registerListCommand(smartcli: plugins.smartcli.Smartcli) {
       const processes = response.processes;
 
       if (processes.length === 0) {
-        console.log('No processes running.');
+        console.log('No processes configured.');
+        console.log('Use "tspm add <command>" to add one, e.g.:');
+        console.log('  tspm add "pnpm start"');
         return;
       }
 
       console.log('Process List:');
       console.log(
-        '┌─────────┬─────────────┬───────────┬───────────┬──────────┬──────────┐',
+        '┌─────────┬─────────────┬───────────┬───────────┬──────────┬──────────┬─────────┐',
       );
       console.log(
-        '│ ID      │ Name        │ Status    │ PID       │ Memory   │ Restarts │',
+        '│ ID      │ Name        │ Status    │ PID       │ Memory   │ CPU      │ Restarts │',
       );
       console.log(
-        '├─────────┼─────────────┼───────────┼───────────┼──────────┼──────────┤',
+        '├─────────┼─────────────┼───────────┼───────────┼──────────┼──────────┼──────────┤',
       );
 
       for (const proc of processes) {
@@ -38,13 +40,18 @@ export function registerListCommand(smartcli: plugins.smartcli.Smartcli) {
               : '\x1b[33m';
         const resetColor = '\x1b[0m';
 
+        const cpuStr = typeof proc.cpu === 'number' && isFinite(proc.cpu)
+          ? `${proc.cpu.toFixed(1)}%`
+          : '-';
+        // Name is not part of IProcessInfo; show ID as placeholder for now
+        const nameDisplay = String(proc.id);
         console.log(
-          `│ ${pad(proc.id, 7)} │ ${pad(proc.id, 11)} │ ${statusColor}${pad(proc.status, 9)}${resetColor} │ ${pad((proc.pid || '-').toString(), 9)} │ ${pad(formatMemory(proc.memory), 8)} │ ${pad(proc.restarts.toString(), 8)} │`,
+          `│ ${pad(String(proc.id), 7)} │ ${pad(nameDisplay, 11)} │ ${statusColor}${pad(proc.status, 9)}${resetColor} │ ${pad((proc.pid || '-').toString(), 9)} │ ${pad(formatMemory(proc.memory), 8)} │ ${pad(cpuStr, 8)} │ ${pad(proc.restarts.toString(), 8)} │`,
         );
       }
 
       console.log(
-        '└─────────┴─────────────┴───────────┴───────────┴──────────┴──────────┘',
+        '└─────────┴─────────────┴───────────┴───────────┴──────────┴──────────┴──────────┘',
       );
     },
     { actionLabel: 'list processes' },

ts/cli/commands/process/logs.ts

@@ -1,8 +1,8 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { registerIpcCommand } from '../../registration/index.js';
-import { getBool, getNumber } from '../../helpers/argv.js';
+import { getBool, getNumber, getString } from '../../helpers/argv.js';
 import { formatLog } from '../../helpers/formatting.js';
 import { withStreamingLifecycle } from '../../helpers/lifecycle.js';
 
@@ -11,26 +11,97 @@ export function registerLogsCommand(smartcli: plugins.smartcli.Smartcli) {
     smartcli,
     'logs',
     async (argvArg: CliArguments) => {
-      const id = argvArg._[1];
-      if (!id) {
-        console.error('Error: Please provide a process ID');
-        console.log('Usage: tspm logs <id> [options]');
+      const target = argvArg._[1];
+      if (!target) {
+        console.error('Error: Please provide a process target');
+        console.log('Usage: tspm logs <id | id:N | name:LABEL> [options]');
         console.log('\nOptions:');
-        console.log('  --lines <n>   Number of lines to show (default: 50)');
-        console.log('  --follow      Stream logs in real-time (like tail -f)');
+        console.log('  --lines <n>         Number of lines to show (default: 50)');
+        console.log('  --since <dur>       Only show logs since duration (e.g., 10m, 2h, 1d)');
+        console.log('  --stderr-only       Only show stderr logs');
+        console.log('  --stdout-only       Only show stdout logs');
+        console.log('  --ndjson            Output each log as JSON line');
+        console.log('  --follow            Stream logs in real-time (like tail -f)');
         return;
       }
 
       const lines = getNumber(argvArg, 'lines', 50);
       const follow = getBool(argvArg, 'follow', 'f');
+      const sinceSpec = getString(argvArg, 'since');
+      const stderrOnly = getBool(argvArg, 'stderr-only');
+      const stdoutOnly = getBool(argvArg, 'stdout-only');
+      const ndjson = getBool(argvArg, 'ndjson');
 
-      const response = await tspmIpcClient.request('getLogs', { id, lines });
+      const parseDuration = (spec?: string): number | undefined => {
+        if (!spec) return undefined;
+        const m = spec.trim().match(/^(\d+)(ms|s|m|h|d)?$/i);
+        if (!m) return undefined;
+        const val = Number(m[1]);
+        const unit = (m[2] || 'm').toLowerCase();
+        const mult = unit === 'ms' ? 1 : unit === 's' ? 1000 : unit === 'm' ? 60000 : unit === 'h' ? 3600000 : 86400000;
+        return Date.now() - val * mult;
+      };
+      const sinceTime = parseDuration(sinceSpec);
+      const typesFilter: Array<'stdout' | 'stderr' | 'system'> | undefined =
+        stderrOnly && !stdoutOnly
+          ? ['stderr']
+          : stdoutOnly && !stderrOnly
+            ? ['stdout']
+            : undefined; // all
+
+      const resolved = await tspmIpcClient.request('resolveTarget', { target: String(target) });
+      const id = resolved.id;
+      const response = await tspmIpcClient.request('getLogs', { id, lines: sinceTime ? 0 : lines });
 
       if (!follow) {
         // One-shot mode - auto-disconnect handled by registerIpcCommand
-        console.log(`Logs for process: ${id} (last ${lines} lines)`);
+        const filtered = response.logs.filter((l) => {
+          if (typesFilter && !typesFilter.includes(l.type)) return false;
+          if (sinceTime && new Date(l.timestamp).getTime() < sinceTime) return false;
+          return true;
+        });
+        console.log(`Logs for process: ${id} (${sinceTime ? 'since ' + new Date(sinceTime).toLocaleString() : 'last ' + lines + ' lines'})`);
         console.log('─'.repeat(60));
-        for (const log of response.logs) {
+        for (const log of filtered) {
+          if (ndjson) {
+            console.log(
+              JSON.stringify({
+                ...log,
+                timestamp: new Date(log.timestamp).getTime(),
+              }),
+            );
+          } else {
+            const timestamp = new Date(log.timestamp).toLocaleTimeString();
+            const prefix =
+              log.type === 'stdout'
+                ? '[OUT]'
+                : log.type === 'stderr'
+                  ? '[ERR]'
+                  : '[SYS]';
+            console.log(`${timestamp} ${prefix} ${log.message}`);
+          }
+        }
+        return;
+      }
+
+      // Streaming mode
+      console.log(`Logs for process: ${resolved.name || id} (streaming...)`);
+      console.log('─'.repeat(60));
+
+      // Prepare backlog printing state and stream handler
+      let lastSeq = 0;
+      let lastRunId: string | undefined = undefined;
+      const printLog = (log: any) => {
+        if (typesFilter && !typesFilter.includes(log.type)) return;
+        if (sinceTime && new Date(log.timestamp).getTime() < sinceTime) return;
+        if (ndjson) {
+          console.log(
+            JSON.stringify({
+              ...log,
+              timestamp: new Date(log.timestamp).getTime(),
+            }),
+          );
+        } else {
           const timestamp = new Date(log.timestamp).toLocaleTimeString();
           const prefix =
             log.type === 'stdout'
@@ -40,43 +111,60 @@ export function registerLogsCommand(smartcli: plugins.smartcli.Smartcli) {
                 : '[SYS]';
           console.log(`${timestamp} ${prefix} ${log.message}`);
         }
-        return;
-      }
+      };
 
-      // Streaming mode
-      console.log(`Logs for process: ${id} (streaming...)`);
-      console.log('─'.repeat(60));
-
-      let lastSeq = 0;
+      // Print initial backlog (already fetched via getLogs)
       for (const log of response.logs) {
-        const timestamp = new Date(log.timestamp).toLocaleTimeString();
-        const prefix =
-          log.type === 'stdout'
-            ? '[OUT]'
-            : log.type === 'stderr'
-              ? '[ERR]'
-              : '[SYS]';
-        console.log(`${timestamp} ${prefix} ${log.message}`);
+        printLog(log);
         if (log.seq !== undefined) lastSeq = Math.max(lastSeq, log.seq);
+        if ((log as any).runId) lastRunId = (log as any).runId;
       }
 
+      // Request additional backlog delivered as incremental messages to avoid large payloads
+      try {
+        const disposeBacklog = tspmIpcClient.onBacklogTopic(id, (log: any) => {
+          if (log.runId && log.runId !== lastRunId) {
+            console.log(`[INFO] Detected process restart (runId changed).`);
+            lastSeq = -1;
+            lastRunId = log.runId;
+          }
+          if (log.seq !== undefined && log.seq <= lastSeq) return;
+          if (log.seq !== undefined && log.seq > lastSeq + 1) {
+            console.log(
+              `[WARNING] Log gap detected: expected seq ${lastSeq + 1}, got ${log.seq}`,
+            );
+          }
+          printLog({ ...log, timestamp: new Date(log.timestamp) });
+          if (log.seq !== undefined) lastSeq = log.seq;
+        });
+        await tspmIpcClient.requestLogsBacklogStream(id, { lines: sinceTime ? undefined : lines, sinceTime, types: typesFilter });
+        // Dispose backlog handler after a short grace (backlog is finite)
+        setTimeout(() => disposeBacklog(), 10000);
+      } catch {}
+
       await withStreamingLifecycle(
         async () => {
+          // Optional: debug subscribers if requested via env (hidden)
+          if (process.env.TSPM_DEBUG === 'true') {
+            try {
+              const subInfo = await tspmIpcClient.request('logs:subscribers' as any, { id });
+              console.log(`[DEBUG] Subscribers for logs.${id}: ${subInfo.count} (${(subInfo.subscribers||[]).join(',')})`);
+            } catch {}
+          }
           await tspmIpcClient.subscribe(id, (log: any) => {
+            // Reset sequence if runId changed (e.g., process restarted)
+            if (log.runId && log.runId !== lastRunId) {
+              console.log(`[INFO] Detected process restart (runId changed).`);
+              lastSeq = -1;
+              lastRunId = log.runId;
+            }
             if (log.seq !== undefined && log.seq <= lastSeq) return;
             if (log.seq !== undefined && log.seq > lastSeq + 1) {
               console.log(
                 `[WARNING] Log gap detected: expected seq ${lastSeq + 1}, got ${log.seq}`,
               );
             }
-            const timestamp = new Date(log.timestamp).toLocaleTimeString();
-            const prefix =
-              log.type === 'stdout'
-                ? '[OUT]'
-                : log.type === 'stderr'
-                  ? '[ERR]'
-                  : '[SYS]';
-            console.log(`${timestamp} ${prefix} ${log.message}`);
+            printLog(log);
             if (log.seq !== undefined) lastSeq = log.seq;
           });
         },

ts/cli/commands/process/restart.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { registerIpcCommand } from '../../registration/index.js';
@@ -8,18 +8,37 @@ export function registerRestartCommand(smartcli: plugins.smartcli.Smartcli) {
     smartcli,
     'restart',
     async (argvArg: CliArguments) => {
-      const id = argvArg._[1];
-      if (!id) {
-        console.error('Error: Please provide a process ID');
-        console.log('Usage: tspm restart <id>');
+      const arg = argvArg._[1];
+      if (!arg) {
+        console.error('Error: Please provide a process target or "all"');
+        console.log('Usage:');
+        console.log('  tspm restart <id | id:N | name:LABEL>');
+        console.log('  tspm restart all');
         return;
       }
 
-      console.log(`Restarting process: ${id}`);
-      const response = await tspmIpcClient.request('restart', { id });
+      if (String(arg).toLowerCase() === 'all') {
+        console.log('Restarting all processes...');
+        const res = await tspmIpcClient.request('restartAll', {});
+        if (res.restarted.length > 0) {
+          console.log(`✓ Restarted ${res.restarted.length} processes:`);
+          for (const id of res.restarted) console.log(`  - ${id}`);
+        }
+        if (res.failed.length > 0) {
+          console.log(`✗ Failed to restart ${res.failed.length} processes:`);
+          for (const f of res.failed) console.log(`  - ${f.id}: ${f.error}`);
+          process.exitCode = 1;
+        }
+        return;
+      }
+
+      const target = String(arg);
+      console.log(`Restarting process: ${target}`);
+      const resolved = await tspmIpcClient.request('resolveTarget', { target });
+      const response = await tspmIpcClient.request('restart', { id: resolved.id });
 
       console.log(`✓ Process restarted successfully`);
-      console.log(`  ID: ${response.processId}`);
+      console.log(`  ID: ${response.processId}${resolved.name ? ` (name: ${resolved.name})` : ''}`);
       console.log(`  PID: ${response.pid || 'N/A'}`);
       console.log(`  Status: ${response.status}`);
     },

ts/cli/commands/process/search.ts

@@ -0,0 +1,62 @@
+import * as plugins from '../../plugins.js';
+import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
+import type { CliArguments } from '../../types.js';
+import { registerIpcCommand } from '../../registration/index.js';
+
+export function registerSearchCommand(smartcli: plugins.smartcli.Smartcli) {
+  registerIpcCommand(
+    smartcli,
+    'search',
+    async (argvArg: CliArguments) => {
+      const query = String(argvArg._[1] || '').trim();
+      if (!query) {
+        console.error('Error: Please provide a search query');
+        console.log('Usage: tspm search <name-fragment | id-fragment>');
+        return;
+      }
+
+      // Fetch list of processes, then enrich with names via describe
+      const listRes = await tspmIpcClient.request('list', {});
+      const processes = listRes.processes;
+
+      // If there are no processes, short-circuit
+      if (processes.length === 0) {
+        console.log('No processes found.');
+        return;
+      }
+
+      const lowerQ = query.toLowerCase();
+      const matches: Array<{ id: number; name?: string }> = [];
+
+      // Collect describe calls to obtain names
+      for (const proc of processes) {
+        try {
+          const desc = await tspmIpcClient.request('describe', { id: proc.id });
+          const name = desc.config.name || '';
+          const idStr = String(proc.id);
+          if (name.toLowerCase().includes(lowerQ) || idStr.includes(query)) {
+            matches.push({ id: proc.id, name });
+          }
+        } catch {
+          // Ignore describe errors for individual processes
+        }
+      }
+
+      if (matches.length === 0) {
+        console.log(`No matches for "${query}"`);
+        return;
+      }
+
+      console.log(`Matches for "${query}":`);
+      for (const m of matches) {
+        if (m.name) {
+          console.log(`- id:${m.id}\tname:${m.name}`);
+        } else {
+          console.log(`- id:${m.id}`);
+        }
+      }
+    },
+    { actionLabel: 'search processes' },
+  );
+}
+

ts/cli/commands/process/start.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { IProcessConfig } from '../../../shared/protocol/ipc.types.js';
 import type { CliArguments } from '../../types.js';
@@ -10,23 +10,18 @@ export function registerStartCommand(smartcli: plugins.smartcli.Smartcli) {
     smartcli,
     'start',
     async (argvArg: CliArguments) => {
-      const id = argvArg._[1];
-      if (!id) {
-        console.error('Error: Please provide a process ID to start');
-        console.log('Usage: tspm start <id>');
+      const target = argvArg._[1];
+      if (!target) {
+        console.error('Error: Please provide a process target to start');
+        console.log('Usage: tspm start <id | id:N | name:LABEL>');
         return;
       }
 
-      const desc = await tspmIpcClient.request('describe', { id }).catch(() => null);
-      if (!desc) {
-        console.error(`Process with id '${id}' not found. Use 'tspm add' first.`);
-        return;
-      }
-
-      console.log(`Starting process id ${id} (${desc.config.name || id})...`);
-      const response = await tspmIpcClient.request('start', { config: desc.config });
+      console.log(`Starting process: ${target}...`);
+      const resolved = await tspmIpcClient.request('resolveTarget', { target: String(target) });
+      const response = await tspmIpcClient.request('startById', { id: resolved.id });
       console.log('✓ Process started');
-      console.log(`  ID: ${response.processId}`);
+      console.log(`  ID: ${response.processId}${resolved.name ? ` (name: ${resolved.name})` : ''}`);
       console.log(`  PID: ${response.pid || 'N/A'}`);
       console.log(`  Status: ${response.status}`);
     },

ts/cli/commands/process/stop.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { tspmIpcClient } from '../../../client/tspm.ipcclient.js';
 import type { CliArguments } from '../../types.js';
 import { registerIpcCommand } from '../../registration/index.js';
@@ -8,15 +8,16 @@ export function registerStopCommand(smartcli: plugins.smartcli.Smartcli) {
     smartcli,
     'stop',
     async (argvArg: CliArguments) => {
-      const id = argvArg._[1];
-      if (!id) {
-        console.error('Error: Please provide a process ID');
-        console.log('Usage: tspm stop <id>');
+      const target = argvArg._[1];
+      if (!target) {
+        console.error('Error: Please provide a process target');
+        console.log('Usage: tspm stop <id | id:N | name:LABEL>');
         return;
       }
 
-      console.log(`Stopping process: ${id}`);
-      const response = await tspmIpcClient.request('stop', { id });
+      console.log(`Stopping process: ${target}`);
+      const resolved = await tspmIpcClient.request('resolveTarget', { target: String(target) });
+      const response = await tspmIpcClient.request('stop', { id: resolved.id });
 
       if (response.success) {
         console.log(`✓ ${response.message}`);

ts/cli/commands/reset.ts

@@ -0,0 +1,33 @@
+import * as plugins from '../plugins.js';
+import { registerIpcCommand } from '../registration/index.js';
+import { tspmIpcClient } from '../../client/tspm.ipcclient.js';
+
+export function registerResetCommand(smartcli: plugins.smartcli.Smartcli) {
+  registerIpcCommand(
+    smartcli,
+    'reset',
+    async () => {
+      console.log('This will stop all processes and clear saved configurations.');
+      const confirmed = await plugins.smartinteract.SmartInteract.getCliConfirmation(
+        'Are you sure you want to reset TSPM? (stops all and removes configs)',
+        false,
+      );
+
+      if (!confirmed) {
+        console.log('Reset cancelled. No changes made.');
+        return;
+      }
+
+      // Single IPC call to reset
+      const result = await tspmIpcClient.request('reset', {});
+      const failedCount = result.failed.length;
+      console.log(`Stopped ${result.stopped.length} processes.`);
+      if (failedCount) {
+        console.log(`${failedCount} processes failed to stop (configs cleared anyway).`);
+      }
+      console.log(`Cleared ${result.removed.length} saved configurations.`);
+      console.log('TSPM has been reset.');
+    },
+    { actionLabel: 'reset TSPM' },
+  );
+}

ts/cli/commands/service/disable.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { TspmServiceManager } from '../../../client/tspm.servicemanager.js';
 import { Logger } from '../../../shared/common/utils.errorhandler.js';
 import type { CliArguments } from '../../types.js';

ts/cli/commands/service/enable.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../../plugins.js';
+import * as plugins from '../../plugins.js';
 import { TspmServiceManager } from '../../../client/tspm.servicemanager.js';
 import { Logger } from '../../../shared/common/utils.errorhandler.js';
 import type { CliArguments } from '../../types.js';

ts/cli/commands/stats.ts

@@ -0,0 +1,66 @@
+import * as plugins from '../plugins.js';
+import { tspmIpcClient } from '../../client/tspm.ipcclient.js';
+import type { CliArguments } from '../types.js';
+import { registerIpcCommand } from '../registration/index.js';
+import { pad } from '../helpers/formatting.js';
+import { formatMemory } from '../helpers/memory.js';
+
+export function registerStatsCommand(smartcli: plugins.smartcli.Smartcli) {
+  registerIpcCommand(
+    smartcli,
+    'stats',
+    async (_argvArg: CliArguments) => {
+      // Daemon status
+      const status = await tspmIpcClient.request('daemon:status', {});
+
+      console.log('TSPM Daemon:');
+      console.log('─'.repeat(60));
+      console.log(`Version:      ${status.version || 'unknown'}`);
+      console.log(`PID:          ${status.pid}`);
+      console.log(`Uptime:       ${Math.floor((status.uptime || 0) / 1000)}s`);
+      console.log(`Processes:    ${status.processCount}`);
+      if (typeof status.memoryUsage === 'number') {
+        console.log(`Memory:       ${formatMemory(status.memoryUsage)}`);
+      }
+      if (typeof status.cpuUsage === 'number') {
+        console.log(`CPU (user):   ${status.cpuUsage.toFixed(3)}s`);
+      }
+      if ((status as any).paths) {
+        const pathsInfo = (status as any).paths as { tspmDir?: string; socketPath?: string; pidFile?: string };
+        console.log(`tspmDir:      ${pathsInfo.tspmDir || '-'}`);
+        console.log(`Socket:       ${pathsInfo.socketPath || '-'}`);
+        console.log(`PID File:     ${pathsInfo.pidFile || '-'}`);
+      }
+      if ((status as any).configs) {
+        const cfg = (status as any).configs as { processConfigs?: number };
+        console.log(`Configs:      ${cfg.processConfigs ?? 0}`);
+      }
+      if ((status as any).logsInMemory) {
+        const lm = (status as any).logsInMemory as { totalCount: number; totalBytes: number };
+        console.log(`Logs (mem):   ${lm.totalCount} entries, ${formatMemory(lm.totalBytes)}`);
+      }
+      console.log('');
+
+      // Process list (reuse list view with CPU column)
+      const response = await tspmIpcClient.request('list', {});
+      const processes = response.processes;
+      console.log('Process List:');
+      console.log('┌─────────┬─────────────┬───────────┬───────────┬──────────┬──────────┬─────────┐');
+      console.log('│ ID      │ Name        │ Status    │ PID       │ Memory   │ CPU      │ Restarts │');
+      console.log('├─────────┼─────────────┼───────────┼───────────┼──────────┼──────────┼──────────┤');
+      for (const proc of processes) {
+        const statusColor =
+          proc.status === 'online' ? '\x1b[32m' : proc.status === 'errored' ? '\x1b[31m' : '\x1b[33m';
+        const resetColor = '\x1b[0m';
+        const cpuStr = typeof proc.cpu === 'number' && isFinite(proc.cpu) ? `${proc.cpu.toFixed(1)}%` : '-';
+        const nameDisplay = String(proc.id); // name not carried in IProcessInfo
+        console.log(
+          `│ ${pad(String(proc.id), 7)} │ ${pad(nameDisplay, 11)} │ ${statusColor}${pad(proc.status, 9)}${resetColor} │ ${pad((proc.pid || '-').toString(), 9)} │ ${pad(formatMemory(proc.memory), 8)} │ ${pad(cpuStr, 8)} │ ${pad(proc.restarts.toString(), 8)} │`,
+        );
+      }
+      console.log('└─────────┴─────────────┴───────────┴───────────┴──────────┴──────────┴──────────┘');
+    },
+    { actionLabel: 'get daemon stats' },
+  );
+}
+

ts/cli/helpers/interactive-edit.ts

@@ -0,0 +1,164 @@
+import * as plugins from '../plugins.js';
+import { tspmIpcClient } from '../../client/tspm.ipcclient.js';
+import { formatMemory, parseMemoryString } from './memory.js';
+
+export async function interactiveEditProcess(processId: number): Promise<void> {
+  // Load current config
+  const { config } = await tspmIpcClient.request('describe', { id: processId as any });
+
+  // Create interactive prompts for editing
+  const smartInteract = new plugins.smartinteract.SmartInteract([
+    {
+      name: 'name',
+      type: 'input',
+      message: 'Process name:',
+      default: config.name,
+      validate: (input: string) => {
+        return input && input.trim() !== '';
+      }
+    },
+    {
+      name: 'command',
+      type: 'input',
+      message: 'Command to execute:',
+      default: config.command,
+      validate: (input: string) => {
+        return input && input.trim() !== '';
+      }
+    },
+    {
+      name: 'projectDir',
+      type: 'input',
+      message: 'Working directory:',
+      default: config.projectDir,
+      validate: (input: string) => {
+        return input && input.trim() !== '';
+      }
+    },
+    {
+      name: 'memoryLimit',
+      type: 'input',
+      message: 'Memory limit (e.g., 512M, 1G):',
+      default: formatMemory(config.memoryLimitBytes),
+      validate: (input: string) => {
+        const parsed = parseMemoryString(input);
+        return parsed !== null;
+      }
+    },
+    {
+      name: 'autorestart',
+      type: 'confirm',
+      message: 'Enable auto-restart on failure?',
+      default: config.autorestart
+    },
+    {
+      name: 'watch',
+      type: 'confirm',
+      message: 'Enable file watching for auto-restart?',
+      default: config.watch || false
+    },
+    {
+      name: 'updateEnv',
+      type: 'confirm',
+      message: 'Update environment variables to current environment?',
+      default: true
+    }
+  ]);
+
+  console.log('\n📝 Edit Process Configuration');
+  console.log(`   Process ID: ${processId}`);
+  console.log('   (Press Enter to keep current values)\n');
+
+  // Run the interactive prompts
+  const answerBucket = await smartInteract.runQueue();
+
+  // Get answers from the bucket
+  const name = answerBucket.getAnswerFor('name');
+  const command = answerBucket.getAnswerFor('command');
+  const projectDir = answerBucket.getAnswerFor('projectDir');
+  const memoryLimit = answerBucket.getAnswerFor('memoryLimit');
+  const autorestart = answerBucket.getAnswerFor('autorestart');
+  const watch = answerBucket.getAnswerFor('watch');
+  const updateEnv = answerBucket.getAnswerFor('updateEnv');
+
+  // Prepare updates object
+  const updates: any = {};
+  
+  // Check what has changed
+  if (name !== config.name) {
+    updates.name = name;
+  }
+  
+  if (command !== config.command) {
+    updates.command = command;
+  }
+  
+  if (projectDir !== config.projectDir) {
+    updates.projectDir = projectDir;
+  }
+  
+  const newMemoryBytes = parseMemoryString(memoryLimit);
+  if (newMemoryBytes !== config.memoryLimitBytes) {
+    updates.memoryLimitBytes = newMemoryBytes;
+  }
+  
+  if (autorestart !== config.autorestart) {
+    updates.autorestart = autorestart;
+  }
+  
+  if (watch !== config.watch) {
+    updates.watch = watch;
+  }
+
+  // Handle environment variables update if requested
+  if (updateEnv) {
+    const essentialEnvVars: NodeJS.ProcessEnv = {
+      PATH: process.env.PATH || '',
+      HOME: process.env.HOME,
+      USER: process.env.USER,
+      SHELL: process.env.SHELL,
+      LANG: process.env.LANG,
+      LC_ALL: process.env.LC_ALL,
+      // Node.js specific
+      NODE_ENV: process.env.NODE_ENV,
+      NODE_PATH: process.env.NODE_PATH,
+      // npm/pnpm/yarn paths
+      npm_config_prefix: process.env.npm_config_prefix,
+      // Include any TSPM_ prefixed vars
+      ...Object.fromEntries(
+        Object.entries(process.env).filter(([key]) => key.startsWith('TSPM_'))
+      ),
+    };
+
+    // Remove undefined values
+    Object.keys(essentialEnvVars).forEach(key => {
+      if (essentialEnvVars[key] === undefined) {
+        delete essentialEnvVars[key];
+      }
+    });
+
+    updates.env = { ...(config.env || {}), ...essentialEnvVars };
+  }
+
+  // Only update if there are changes
+  if (Object.keys(updates).length === 0) {
+    console.log('\n✓ No changes made');
+    return;
+  }
+
+  // Send updates to daemon
+  await tspmIpcClient.request('update', {
+    id: processId as any,
+    updates,
+  });
+
+  // Display what was updated
+  console.log('\n✓ Process configuration updated successfully');
+  if (updates.name) console.log(`  Name: ${updates.name}`);
+  if (updates.command) console.log(`  Command: ${updates.command}`);
+  if (updates.projectDir) console.log(`  Directory: ${updates.projectDir}`);
+  if (updates.memoryLimitBytes) console.log(`  Memory limit: ${formatMemory(updates.memoryLimitBytes)}`);
+  if (updates.autorestart !== undefined) console.log(`  Auto-restart: ${updates.autorestart}`);
+  if (updates.watch !== undefined) console.log(`  Watch: ${updates.watch ? 'enabled' : 'disabled'}`);
+  if (updateEnv) console.log('  Environment variables: updated');
+}

ts/cli/index.ts

@@ -1,6 +1,8 @@
-import * as plugins from '../plugins.js';
+import * as plugins from './plugins.js';
+import { tspmIpcClient } from '../client/tspm.ipcclient.js';
 import * as paths from '../paths.js';
 import { Logger, LogLevel } from '../shared/common/utils.errorhandler.js';
+import { TspmServiceManager } from '../client/tspm.servicemanager.js';
 
 // Import command registration functions
 import { registerDefaultCommand } from './commands/default.js';
@@ -9,15 +11,19 @@ import { registerAddCommand } from './commands/process/add.js';
 import { registerStopCommand } from './commands/process/stop.js';
 import { registerRestartCommand } from './commands/process/restart.js';
 import { registerDeleteCommand } from './commands/process/delete.js';
+import { registerSearchCommand } from './commands/process/search.js';
 import { registerListCommand } from './commands/process/list.js';
 import { registerDescribeCommand } from './commands/process/describe.js';
 import { registerLogsCommand } from './commands/process/logs.js';
+import { registerEditCommand } from './commands/process/edit.js';
 import { registerStartAllCommand } from './commands/batch/start-all.js';
 import { registerStopAllCommand } from './commands/batch/stop-all.js';
 import { registerRestartAllCommand } from './commands/batch/restart-all.js';
 import { registerDaemonCommand } from './commands/daemon/index.js';
+import { registerStatsCommand } from './commands/stats.js';
 import { registerEnableCommand } from './commands/service/enable.js';
 import { registerDisableCommand } from './commands/service/disable.js';
+import { registerResetCommand } from './commands/reset.js';
 
 // Export types for external use
 export type { CliArguments } from './types.js';
@@ -37,6 +43,56 @@ export const run = async (): Promise<void> => {
   }
 
   const smartcliInstance = new plugins.smartcli.Smartcli();
+  // Intercept -v/--version to show CLI and daemon versions
+  const args = process.argv.slice(2);
+  if (args.includes('-v') || args.includes('--version')) {
+    const cliVersion = tspmProjectinfo.npm.version;
+    console.log(`tspm CLI: ${cliVersion}`);
+    const status = await tspmIpcClient.getDaemonStatus();
+    if (status) {
+      console.log(
+        `Daemon: running v${status.version || 'unknown'} (pid ${status.pid})`,
+      );
+      // If versions mismatch, offer to refresh the systemd service
+      if (status.version && status.version !== cliVersion) {
+        console.log('\nVersion mismatch detected:');
+        console.log(`  CLI:    v${cliVersion}`);
+        console.log(`  Daemon: v${status.version}`);
+        console.log(
+          '\nThis can happen after upgrading tspm. The systemd service may still point to an older version.\n' +
+            'You can refresh the service (equivalent to "tspm disable" then "tspm enable").',
+        );
+
+        // Ask the user for confirmation
+        const confirm = await plugins.smartinteract.SmartInteract.getCliConfirmation(
+          'Refresh the systemd service now?',
+          true,
+        );
+        if (confirm) {
+          try {
+            const sm = new TspmServiceManager();
+            console.log('Refreshing TSPM system service...');
+            await sm.disableService();
+            await sm.enableService();
+            console.log('✓ Service refreshed. Daemon restarted via systemd.');
+          } catch (err: any) {
+            console.error(
+              'Failed to refresh service automatically. You can try manually:\n  tspm disable && tspm enable',
+            );
+            console.error(err?.message || String(err));
+          }
+        } else {
+          console.log('Skipped service refresh.');
+        }
+      }
+    } else {
+      console.log('Daemon: not running');
+    }
+    // Ensure we disconnect any IPC client connection used for status
+    try { await tspmIpcClient.disconnect(); } catch {}
+    return; // do not start parser
+  }
+  // Keep Smartcli version info for help output but not used for -v now
   smartcliInstance.addVersion(tspmProjectinfo.npm.version);
 
   // Register all commands
@@ -52,6 +108,8 @@ export const run = async (): Promise<void> => {
   registerListCommand(smartcliInstance);
   registerDescribeCommand(smartcliInstance);
   registerLogsCommand(smartcliInstance);
+  registerEditCommand(smartcliInstance);
+  registerSearchCommand(smartcliInstance);
 
   // Batch commands
   registerStartAllCommand(smartcliInstance);
@@ -60,11 +118,15 @@ export const run = async (): Promise<void> => {
 
   // Daemon commands
   registerDaemonCommand(smartcliInstance);
+  registerStatsCommand(smartcliInstance);
 
   // Service commands
   registerEnableCommand(smartcliInstance);
   registerDisableCommand(smartcliInstance);
 
+  // Maintenance commands
+  registerResetCommand(smartcliInstance);
+
   // Start parsing commands
   smartcliInstance.startParse();
 };

ts/cli/plugins.ts

@@ -0,0 +1,8 @@
+// Minimal plugin set for the CLI to keep startup light
+import * as path from 'node:path';
+import * as projectinfo from '@push.rocks/projectinfo';
+import * as smartcli from '@push.rocks/smartcli';
+import * as smartinteract from '@push.rocks/smartinteract';
+
+export { path, projectinfo, smartcli, smartinteract };
+

ts/cli/registration/index.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../../plugins.js';
+import * as plugins from '../plugins.js';
 import type {
   CliArguments,
   CommandAction,

ts/client/plugins.ts

@@ -0,0 +1,7 @@
+// Minimal plugin set for lightweight client startup
+import * as path from 'node:path';
+import * as smartdaemon from '@push.rocks/smartdaemon';
+import * as smartipc from '@push.rocks/smartipc';
+
+export { path, smartdaemon, smartipc };
+

ts/client/tspm.ipcclient.ts

@@ -1,5 +1,7 @@
-import * as plugins from '../plugins.js';
+import * as plugins from './plugins.js';
 import * as paths from '../paths.js';
+import { toProcessId } from '../shared/protocol/id.js';
+import type { ProcessId } from '../shared/protocol/id.js';
 
 import type {
   IpcMethodMap,
@@ -15,6 +17,9 @@ export class TspmIpcClient {
   private socketPath: string;
   private daemonPidFile: string;
   private isConnected: boolean = false;
+  // Store event handlers for cleanup
+  private heartbeatTimeoutHandler?: () => void;
+  private markDisconnectedHandler?: () => void;
 
   constructor() {
     this.socketPath = plugins.path.join(paths.tspmDir, 'tspm.sock');
@@ -72,20 +77,21 @@ export class TspmIpcClient {
       this.isConnected = true;
 
       // Handle heartbeat timeouts gracefully
-      this.ipcClient.on('heartbeatTimeout', () => {
+      this.heartbeatTimeoutHandler = () => {
         console.warn('Heartbeat timeout detected, connection may be degraded');
         this.isConnected = false;
-      });
+      };
+      this.ipcClient.on('heartbeatTimeout', this.heartbeatTimeoutHandler);
 
       // Reflect connection lifecycle on the client state
-      const markDisconnected = () => {
+      this.markDisconnectedHandler = () => {
         this.isConnected = false;
       };
       // Common lifecycle events
-      this.ipcClient.on('disconnect', markDisconnected as any);
-      this.ipcClient.on('close', markDisconnected as any);
-      this.ipcClient.on('end', markDisconnected as any);
-      this.ipcClient.on('error', markDisconnected as any);
+      this.ipcClient.on('disconnect', this.markDisconnectedHandler as any);
+      this.ipcClient.on('close', this.markDisconnectedHandler as any);
+      this.ipcClient.on('end', this.markDisconnectedHandler as any);
+      this.ipcClient.on('error', this.markDisconnectedHandler as any);
 
       // connected
     } catch (error) {
@@ -101,6 +107,21 @@ export class TspmIpcClient {
    */
   public async disconnect(): Promise<void> {
     if (this.ipcClient) {
+      // Remove event listeners before disconnecting
+      if (this.heartbeatTimeoutHandler) {
+        this.ipcClient.removeListener('heartbeatTimeout', this.heartbeatTimeoutHandler);
+      }
+      if (this.markDisconnectedHandler) {
+        this.ipcClient.removeListener('disconnect', this.markDisconnectedHandler as any);
+        this.ipcClient.removeListener('close', this.markDisconnectedHandler as any);
+        this.ipcClient.removeListener('end', this.markDisconnectedHandler as any);
+        this.ipcClient.removeListener('error', this.markDisconnectedHandler as any);
+      }
+      
+      // Clear handler references
+      this.heartbeatTimeoutHandler = undefined;
+      this.markDisconnectedHandler = undefined;
+      
       await this.ipcClient.disconnect();
       this.ipcClient = null;
       this.isConnected = false;
@@ -144,27 +165,81 @@ export class TspmIpcClient {
    * Subscribe to log updates for a specific process
    */
   public async subscribe(
-    processId: string,
+    processId: ProcessId | number | string,
     handler: (log: any) => void,
   ): Promise<void> {
     if (!this.ipcClient || !this.isConnected) {
       throw new Error('Not connected to daemon');
     }
 
-    const topic = `logs.${processId}`;
-    await this.ipcClient.subscribe(`topic:${topic}`, handler);
+    const id = toProcessId(processId);
+    const topic = `logs.${id}`;
+    // Note: IpcClient.subscribe expects the bare topic (without the 'topic:' prefix)
+    // and will register a handler for 'topic:<topic>' internally.
+    await this.ipcClient.subscribe(topic, handler);
+  }
+
+  /**
+   * Request backlog logs as a stream from the daemon.
+   * The actual stream will be delivered via the 'stream' event.
+   */
+  public async requestLogsBacklogStream(
+    processId: ProcessId | number | string,
+    opts: { lines?: number; sinceTime?: number; types?: Array<'stdout' | 'stderr' | 'system'> } = {},
+  ): Promise<void> {
+    if (!this.ipcClient || !this.isConnected) {
+      throw new Error('Not connected to daemon');
+    }
+    const id = toProcessId(processId);
+    await this.request('logs:subscribe' as any, {
+      id,
+      lines: opts.lines,
+      sinceTime: opts.sinceTime,
+      types: opts.types,
+    } as any);
+  }
+
+  /**
+   * Register a handler for incoming streams (e.g., backlog logs)
+   */
+  public onStream(
+    handler: (info: any, readable: NodeJS.ReadableStream) => void,
+  ): void {
+    if (!this.ipcClient) throw new Error('Not connected to daemon');
+    // smartipc emits 'stream' with (info, readable)
+    (this.ipcClient as any).on('stream', handler);
+  }
+
+  /**
+   * Register a temporary handler for backlog topic messages for a specific process
+   */
+  public onBacklogTopic(
+    processId: ProcessId | number | string,
+    handler: (log: any) => void,
+  ): () => void {
+    if (!this.ipcClient) throw new Error('Not connected to daemon');
+    const id = toProcessId(processId);
+    const topicType = `topic:logs.backlog.${id}`;
+    (this.ipcClient as any).onMessage(topicType, handler);
+    return () => {
+      try {
+        (this.ipcClient as any).messageHandlers?.delete?.(topicType);
+      } catch {}
+    };
   }
 
   /**
    * Unsubscribe from log updates for a specific process
    */
-  public async unsubscribe(processId: string): Promise<void> {
+  public async unsubscribe(processId: ProcessId | number | string): Promise<void> {
     if (!this.ipcClient || !this.isConnected) {
       throw new Error('Not connected to daemon');
     }
 
-    const topic = `logs.${processId}`;
-    await this.ipcClient.unsubscribe(`topic:${topic}`);
+    const id = toProcessId(processId);
+    const topic = `logs.${id}`;
+    // Pass bare topic; client handles 'topic:' prefix internally
+    await this.ipcClient.unsubscribe(topic);
   }
 
   /**

ts/client/tspm.servicemanager.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../plugins.js';
+import * as plugins from './plugins.js';
 import * as paths from '../paths.js';
 
 /**

ts/daemon/crashlogmanager.ts

@@ -0,0 +1,270 @@
+import * as plugins from '../plugins.js';
+import * as paths from '../paths.js';
+import type { IProcessLog } from '../shared/protocol/ipc.types.js';
+import type { ProcessId } from '../shared/protocol/id.js';
+
+const smartfs = new plugins.smartfs.SmartFs(new plugins.smartfs.SmartFsProviderNode());
+
+/**
+ * Manages crash log storage for failed processes
+ */
+export class CrashLogManager {
+  private crashLogsDir: string;
+  private readonly MAX_CRASH_LOGS = 100;
+  private readonly MAX_LOG_SIZE_BYTES = 1024 * 1024; // 1MB
+
+  constructor() {
+    this.crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
+  }
+
+  /**
+   * Save a crash log for a failed process
+   */
+  public async saveCrashLog(
+    processId: ProcessId,
+    processName: string,
+    logs: IProcessLog[],
+    exitCode: number | null,
+    signal: string | null,
+    restartCount: number,
+    memoryUsage?: number
+  ): Promise<void> {
+    try {
+      // Ensure directory exists
+      await this.ensureCrashLogsDir();
+
+      // Generate filename with timestamp
+      const timestamp = new Date();
+      const dateStr = this.formatDate(timestamp);
+      const sanitizedName = this.sanitizeFilename(processName);
+      const filename = `${dateStr}_${processId}_${sanitizedName}.log`;
+      const filepath = plugins.path.join(this.crashLogsDir, filename);
+
+      // Get recent logs that fit within size limit
+      const recentLogs = this.getRecentLogs(logs, this.MAX_LOG_SIZE_BYTES);
+
+      // Create crash report
+      const crashReport = this.formatCrashReport({
+        processId,
+        processName,
+        timestamp,
+        exitCode,
+        signal,
+        restartCount,
+        memoryUsage,
+        logs: recentLogs
+      });
+
+      // Write crash log
+      await smartfs.file(filepath).encoding('utf8').write(crashReport);
+
+      // Rotate old logs if needed
+      await this.rotateOldLogs();
+
+      console.log(`Crash log saved: ${filename}`);
+    } catch (error) {
+      console.error(`Failed to save crash log for process ${processId}:`, error);
+    }
+  }
+
+  /**
+   * Format date for filename: YYYY-MM-DD_HH-mm-ss
+   */
+  private formatDate(date: Date): string {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+    return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}`;
+  }
+
+  /**
+   * Sanitize process name for use in filename
+   */
+  private sanitizeFilename(name: string): string {
+    // Replace problematic characters with underscore
+    return name
+      .replace(/[^a-zA-Z0-9-_]/g, '_')
+      .replace(/_+/g, '_')
+      .substring(0, 50); // Limit length
+  }
+
+  /**
+   * Get recent logs that fit within the size limit
+   */
+  private getRecentLogs(logs: IProcessLog[], maxBytes: number): IProcessLog[] {
+    if (logs.length === 0) return [];
+
+    // Start from the end and work backwards
+    const recentLogs: IProcessLog[] = [];
+    let currentSize = 0;
+
+    for (let i = logs.length - 1; i >= 0; i--) {
+      const log = logs[i];
+      const logSize = this.estimateLogSize(log);
+
+      if (currentSize + logSize > maxBytes && recentLogs.length > 0) {
+        // Would exceed limit, stop adding
+        break;
+      }
+
+      recentLogs.unshift(log);
+      currentSize += logSize;
+    }
+
+    return recentLogs;
+  }
+
+  /**
+   * Estimate size of a log entry in bytes
+   */
+  private estimateLogSize(log: IProcessLog): number {
+    // Format: [timestamp] [type] message\n
+    const formatted = `[${new Date(log.timestamp).toISOString()}] [${log.type}] ${log.message}\n`;
+    return Buffer.byteLength(formatted, 'utf8');
+  }
+
+  /**
+   * Format a crash report with metadata and logs
+   */
+  private formatCrashReport(data: {
+    processId: ProcessId;
+    processName: string;
+    timestamp: Date;
+    exitCode: number | null;
+    signal: string | null;
+    restartCount: number;
+    memoryUsage?: number;
+    logs: IProcessLog[];
+  }): string {
+    const lines: string[] = [
+      '================================================================================',
+      'TSPM CRASH REPORT',
+      '================================================================================',
+      `Process:         ${data.processName} (ID: ${data.processId})`,
+      `Date:            ${data.timestamp.toISOString()}`,
+      `Exit Code:       ${data.exitCode ?? 'N/A'}`,
+      `Signal:          ${data.signal ?? 'N/A'}`,
+      `Restart Attempt: ${data.restartCount}/10`,
+    ];
+
+    if (data.memoryUsage !== undefined && data.memoryUsage > 0) {
+      lines.push(`Memory Usage:    ${this.humanReadableBytes(data.memoryUsage)}`);
+    }
+
+    lines.push(
+      '================================================================================',
+      '',
+      `LAST ${data.logs.length} LOG ENTRIES:`,
+      '--------------------------------------------------------------------------------',
+      ''
+    );
+
+    // Add log entries
+    for (const log of data.logs) {
+      const timestamp = new Date(log.timestamp).toISOString();
+      const type = log.type.toUpperCase().padEnd(6);
+      lines.push(`[${timestamp}] [${type}] ${log.message}`);
+    }
+
+    lines.push(
+      '',
+      '================================================================================',
+      'END OF CRASH REPORT',
+      '================================================================================',
+      ''
+    );
+
+    return lines.join('\n');
+  }
+
+  /**
+   * Convert bytes to human-readable format
+   */
+  private humanReadableBytes(bytes: number): string {
+    if (bytes === 0) return '0 Bytes';
+    const k = 1024;
+    const sizes = ['Bytes', 'KB', 'MB', 'GB'];
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
+  }
+
+  /**
+   * Ensure crash logs directory exists
+   */
+  private async ensureCrashLogsDir(): Promise<void> {
+    await smartfs.directory(this.crashLogsDir).create();
+  }
+
+  /**
+   * Rotate old crash logs when exceeding max count
+   */
+  private async rotateOldLogs(): Promise<void> {
+    try {
+      // Get all crash log files
+      const entries = await smartfs.directory(this.crashLogsDir).list();
+      const files = entries.filter(e => e.name.endsWith('.log'));
+
+      if (files.length <= this.MAX_CRASH_LOGS) {
+        return; // No rotation needed
+      }
+
+      // Get file stats and sort by modification time (oldest first)
+      const fileStats = await Promise.all(
+        files.map(async (entry) => {
+          const filepath = plugins.path.join(this.crashLogsDir, entry.name);
+          const stats = await smartfs.file(filepath).stat();
+          return { filepath, mtime: stats.mtime.getTime() };
+        })
+      );
+
+      fileStats.sort((a, b) => a.mtime - b.mtime);
+
+      // Delete oldest files to stay under limit
+      const filesToDelete = fileStats.length - this.MAX_CRASH_LOGS;
+      for (let i = 0; i < filesToDelete; i++) {
+        await smartfs.file(fileStats[i].filepath).delete();
+        console.log(`Rotated old crash log: ${plugins.path.basename(fileStats[i].filepath)}`);
+      }
+    } catch (error) {
+      console.error('Failed to rotate crash logs:', error);
+    }
+  }
+
+  /**
+   * Get list of crash logs for a specific process
+   */
+  public async getCrashLogsForProcess(processId: ProcessId): Promise<string[]> {
+    try {
+      await this.ensureCrashLogsDir();
+      const entries = await smartfs.directory(this.crashLogsDir).list();
+      const files = entries.filter(e => e.name.endsWith('.log') && e.name.includes(`_${processId}_`));
+      return files.map(entry => plugins.path.join(this.crashLogsDir, entry.name));
+    } catch (error) {
+      console.error(`Failed to get crash logs for process ${processId}:`, error);
+      return [];
+    }
+  }
+
+  /**
+   * Clean up all crash logs (for maintenance)
+   */
+  public async cleanupAllCrashLogs(): Promise<void> {
+    try {
+      await this.ensureCrashLogsDir();
+      const entries = await smartfs.directory(this.crashLogsDir).list();
+      const files = entries.filter(e => e.name.endsWith('.log'));
+
+      for (const entry of files) {
+        const filepath = plugins.path.join(this.crashLogsDir, entry.name);
+        await smartfs.file(filepath).delete();
+      }
+
+      console.log(`Cleaned up ${files.length} crash logs`);
+    } catch (error) {
+      console.error('Failed to cleanup crash logs:', error);
+    }
+  }
+}

ts/daemon/logpersistence.ts

@@ -0,0 +1,117 @@
+import * as plugins from '../plugins.js';
+import * as paths from '../paths.js';
+import type { IProcessLog } from '../shared/protocol/ipc.types.js';
+import type { ProcessId } from '../shared/protocol/id.js';
+
+const smartfs = new plugins.smartfs.SmartFs(new plugins.smartfs.SmartFsProviderNode());
+
+/**
+ * Manages persistent log storage for processes
+ */
+export class LogPersistence {
+  private logsDir: string;
+
+  constructor() {
+    this.logsDir = plugins.path.join(paths.tspmDir, 'logs');
+  }
+
+  /**
+   * Get the log file path for a process
+   */
+  private getLogFilePath(processId: ProcessId): string {
+    return plugins.path.join(this.logsDir, `process-${processId}.json`);
+  }
+
+  /**
+   * Ensure the logs directory exists
+   */
+  private async ensureLogsDir(): Promise<void> {
+    await smartfs.directory(this.logsDir).create();
+  }
+
+  /**
+   * Save logs to disk
+   */
+  public async saveLogs(processId: ProcessId, logs: IProcessLog[]): Promise<void> {
+    await this.ensureLogsDir();
+    const filePath = this.getLogFilePath(processId);
+
+    // Write logs as JSON
+    await smartfs.file(filePath).encoding('utf8').write(JSON.stringify(logs, null, 2));
+  }
+
+  /**
+   * Load logs from disk
+   */
+  public async loadLogs(processId: ProcessId): Promise<IProcessLog[]> {
+    const filePath = this.getLogFilePath(processId);
+
+    try {
+      const exists = await smartfs.file(filePath).exists();
+      if (!exists) {
+        return [];
+      }
+
+      const content = await smartfs.file(filePath).encoding('utf8').read() as string;
+      const logs = JSON.parse(content) as IProcessLog[];
+
+      // Convert date strings back to Date objects
+      return logs.map(log => ({
+        ...log,
+        timestamp: new Date(log.timestamp)
+      }));
+    } catch (error) {
+      console.error(`Failed to load logs for process ${processId}:`, error);
+      return [];
+    }
+  }
+
+  /**
+   * Delete logs from disk after loading
+   */
+  public async deleteLogs(processId: ProcessId): Promise<void> {
+    const filePath = this.getLogFilePath(processId);
+
+    try {
+      const exists = await smartfs.file(filePath).exists();
+      if (exists) {
+        await smartfs.file(filePath).delete();
+      }
+    } catch (error) {
+      console.error(`Failed to delete logs for process ${processId}:`, error);
+    }
+  }
+
+  /**
+   * Calculate approximate memory size of logs in bytes
+   */
+  public static calculateLogMemorySize(logs: IProcessLog[]): number {
+    // Estimate based on JSON string size
+    // This is an approximation but good enough for our purposes
+    return JSON.stringify(logs).length;
+  }
+
+  /**
+   * Clean up old log files (for maintenance)
+   */
+  public async cleanupOldLogs(): Promise<void> {
+    try {
+      await this.ensureLogsDir();
+      const entries = await smartfs.directory(this.logsDir).list();
+      const files = entries.filter(e => e.name.endsWith('.json'));
+
+      for (const entry of files) {
+        const filePath = plugins.path.join(this.logsDir, entry.name);
+        const stats = await smartfs.file(filePath).stat();
+
+        // Delete files older than 7 days
+        const ageInDays = (Date.now() - stats.mtime.getTime()) / (1000 * 60 * 60 * 24);
+        if (ageInDays > 7) {
+          await smartfs.file(filePath).delete();
+        }
+      }
+    } catch (error) {
+      console.error('Failed to cleanup old logs:', error);
+    }
+  }
+}

ts/daemon/processmanager.ts

@@ -2,6 +2,7 @@ import * as plugins from '../plugins.js';
 import { EventEmitter } from 'events';
 import * as paths from '../paths.js';
 import { ProcessMonitor } from './processmonitor.js';
+import { LogPersistence } from './logpersistence.js';
 import { TspmConfig } from './tspm.config.js';
 import {
   Logger,
@@ -16,15 +17,20 @@ import type {
   IProcessLog,
   IMonitorConfig
 } from '../shared/protocol/ipc.types.js';
+import { toProcessId, getNextProcessId } from '../shared/protocol/id.js';
+import type { ProcessId } from '../shared/protocol/id.js';
 
 
 
 export class ProcessManager extends EventEmitter {
-  public processes: Map<string, ProcessMonitor> = new Map();
-  public processConfigs: Map<string, IProcessConfig> = new Map();
-  public processInfo: Map<string, IProcessInfo> = new Map();
+  public processes: Map<ProcessId, ProcessMonitor> = new Map();
+  public processConfigs: Map<ProcessId, IProcessConfig> = new Map();
+  public processInfo: Map<ProcessId, IProcessInfo> = new Map();
+  private processLogs: Map<ProcessId, IProcessLog[]> = new Map();
   private config: TspmConfig;
   private configStorageKey = 'processes';
+  private desiredStateStorageKey = 'desiredStates';
+  private desiredStates: Map<ProcessId, IProcessInfo['status']> = new Map();
   private logger: Logger;
 
   constructor() {
@@ -32,18 +38,19 @@ export class ProcessManager extends EventEmitter {
     this.logger = new Logger('Tspm');
     this.config = new TspmConfig();
     this.loadProcessConfigs();
+    this.loadDesiredStates();
   }
 
   /**
    * Add a process configuration without starting it.
-   * Returns the assigned numeric sequential id as string.
+   * Returns the assigned numeric sequential id.
    */
-  public async add(configInput: Omit<IProcessConfig, 'id'> & { id?: string }): Promise<string> {
+  public async add(configInput: Omit<IProcessConfig, 'id'> & { id?: ProcessId }): Promise<ProcessId> {
     // Determine next numeric id
     const nextId = this.getNextSequentialId();
 
     const config: IProcessConfig = {
-      id: String(nextId),
+      id: nextId,
       name: configInput.name || `process-${nextId}`,
       command: configInput.command,
       args: configInput.args,
@@ -67,6 +74,7 @@ export class ProcessManager extends EventEmitter {
     });
 
     await this.saveProcessConfigs();
+    await this.setDesiredState(config.id, 'stopped');
     return config.id;
   }
 
@@ -87,6 +95,16 @@ export class ProcessManager extends EventEmitter {
 
     // Check if process with this id already exists
     if (this.processes.has(config.id)) {
+      const existing = this.processes.get(config.id)!;
+      // If an existing monitor is present but not running, treat this as a fresh start via restart logic
+      if (!existing.isRunning()) {
+        this.logger.info(
+          `Existing monitor found for id '${config.id}' but not running. Restarting it...`,
+        );
+        await this.restart(config.id);
+        return;
+      }
+      // Already running – surface a meaningful error
       throw new ValidationError(
         `Process with id '${config.id}' already exists`,
         'ERR_DUPLICATE_PROCESS',
@@ -107,7 +125,8 @@ export class ProcessManager extends EventEmitter {
 
       // Create and start process monitor
       const monitor = new ProcessMonitor({
-        name: config.name || config.id,
+        id: config.id,  // Pass the ProcessId for log persistence
+        name: config.name || String(config.id),
         projectDir: config.projectDir,
         command: config.command,
         args: config.args,
@@ -121,13 +140,48 @@ export class ProcessManager extends EventEmitter {
 
       // Set up log event handler to re-emit for pub/sub
       monitor.on('log', (log: IProcessLog) => {
+        // Store log in our persistent storage
+        if (!this.processLogs.has(config.id)) {
+          this.processLogs.set(config.id, []);
+        }
+        const logs = this.processLogs.get(config.id)!;
+        logs.push(log);
+        
+        // Trim logs if they exceed buffer size (default 1000)
+        const bufferSize = config.logBufferSize || 1000;
+        if (logs.length > bufferSize) {
+          this.processLogs.set(config.id, logs.slice(-bufferSize));
+        }
+        
         this.emit('process:log', { processId: config.id, log });
       });
       
-      monitor.start();
+      // Set up event handler to track PID when process starts
+      monitor.on('start', (pid: number) => {
+        this.updateProcessInfo(config.id, { pid });
+      });
       
-      // Update process info
-      this.updateProcessInfo(config.id, { status: 'online' });
+      // Set up event handler to clear PID when process exits
+      monitor.on('exit', () => {
+        this.updateProcessInfo(config.id, { pid: undefined });
+      });
+
+      // Set up failure handler to mark process as errored
+      monitor.on('failed', () => {
+        this.updateProcessInfo(config.id, { status: 'errored', pid: undefined });
+      });
+
+      await monitor.start();
+
+      // Wait a moment for the process to spawn and get its PID
+      await new Promise(resolve => setTimeout(resolve, 100));
+      
+      // Update process info with PID
+      const pid = monitor.getPid();
+      this.updateProcessInfo(config.id, { 
+        status: 'online',
+        pid: pid || undefined
+      });
 
       // Save updated configs
       await this.saveProcessConfigs();
@@ -158,10 +212,36 @@ export class ProcessManager extends EventEmitter {
     }
   }
 
+  /**
+   * Update an existing process configuration
+   */
+  public async update(
+    id: ProcessId,
+    updates: Partial<Omit<IProcessConfig, 'id'>>,
+  ): Promise<IProcessConfig> {
+    const existing = this.processConfigs.get(id);
+    if (!existing) {
+      throw new ValidationError(
+        `Process with id '${id}' does not exist`,
+        'ERR_PROCESS_NOT_FOUND',
+      );
+    }
+
+    // Shallow merge; keep id intact
+    const merged: IProcessConfig = {
+      ...existing,
+      ...updates,
+    } as IProcessConfig;
+
+    this.processConfigs.set(id, merged);
+    await this.saveProcessConfigs();
+    return merged;
+  }
+
   /**
    * Stop a process by id
    */
-  public async stop(id: string): Promise<void> {
+  public async stop(id: ProcessId): Promise<void> {
     this.logger.info(`Stopping process with id '${id}'`);
 
     const monitor = this.processes.get(id);
@@ -175,8 +255,9 @@ export class ProcessManager extends EventEmitter {
     }
 
     try {
-      monitor.stop();
-      this.updateProcessInfo(id, { status: 'stopped' });
+      await monitor.stop();
+      // Ensure status and PID are reflected immediately
+      this.updateProcessInfo(id, { status: 'stopped', pid: undefined });
       this.logger.info(`Successfully stopped process with id '${id}'`);
     } catch (error: Error | unknown) {
       const processError = new ProcessError(
@@ -195,7 +276,7 @@ export class ProcessManager extends EventEmitter {
   /**
    * Restart a process by id
    */
-  public async restart(id: string): Promise<void> {
+  public async restart(id: ProcessId): Promise<void> {
     this.logger.info(`Restarting process with id '${id}'`);
 
     const monitor = this.processes.get(id);
@@ -212,11 +293,12 @@ export class ProcessManager extends EventEmitter {
 
     try {
       // Stop and then start the process
-      monitor.stop();
+      await monitor.stop();
 
       // Create a new monitor instance
       const newMonitor = new ProcessMonitor({
-        name: config.name || config.id,
+        id: config.id,  // Pass the ProcessId for log persistence
+        name: config.name || String(config.id),
         projectDir: config.projectDir,
         command: config.command,
         args: config.args,
@@ -226,18 +308,46 @@ export class ProcessManager extends EventEmitter {
         logBufferSize: config.logBufferSize,
       });
 
-      this.processes.set(id, newMonitor);
-      newMonitor.start();
+      // Set up log event handler for the new monitor
+      newMonitor.on('log', (log: IProcessLog) => {
+        // Store log in our persistent storage
+        if (!this.processLogs.has(id)) {
+          this.processLogs.set(id, []);
+        }
+        const logs = this.processLogs.get(id)!;
+        logs.push(log);
         
-      // Update restart count
+        // Trim logs if they exceed buffer size (default 1000)
+        const bufferSize = config.logBufferSize || 1000;
+        if (logs.length > bufferSize) {
+          this.processLogs.set(id, logs.slice(-bufferSize));
+        }
+        
+        this.emit('process:log', { processId: id, log });
+      });
+      
+      this.processes.set(id, newMonitor);
+      await newMonitor.start();
+
+      // Wait a moment for the process to spawn and get its PID
+      await new Promise(resolve => setTimeout(resolve, 100));
+      
+      // Update restart count and PID
       const info = this.processInfo.get(id);
       if (info) {
+        const pid = newMonitor.getPid();
         this.updateProcessInfo(id, {
           status: 'online',
+          pid: pid || undefined,
           restarts: info.restarts + 1,
         });
       }
 
+      // Mark errored on failure events
+      newMonitor.on('failed', () => {
+        this.updateProcessInfo(id, { status: 'errored', pid: undefined });
+      });
+
       this.logger.info(`Successfully restarted process with id '${id}'`);
     } catch (error: Error | unknown) {
       const processError = new ProcessError(
@@ -253,7 +363,7 @@ export class ProcessManager extends EventEmitter {
   /**
    * Delete a process by id
    */
-  public async delete(id: string): Promise<void> {
+  public async delete(id: ProcessId): Promise<void> {
     this.logger.info(`Deleting process with id '${id}'`);
 
     // Check if process exists
@@ -276,9 +386,15 @@ export class ProcessManager extends EventEmitter {
       this.processes.delete(id);
       this.processConfigs.delete(id);
       this.processInfo.delete(id);
+      this.processLogs.delete(id);
+
+      // Delete persisted logs from disk
+      const logPersistence = new LogPersistence();
+      await logPersistence.deleteLogs(id);
 
       // Save updated configs
       await this.saveProcessConfigs();
+      await this.removeDesiredState(id);
 
       this.logger.info(`Successfully deleted process with id '${id}'`);
     } catch (error: Error | unknown) {
@@ -287,7 +403,14 @@ export class ProcessManager extends EventEmitter {
         this.processes.delete(id);
         this.processConfigs.delete(id);
         this.processInfo.delete(id);
+        this.processLogs.delete(id);
+        
+        // Delete persisted logs from disk even if stop failed
+        const logPersistence = new LogPersistence();
+        await logPersistence.deleteLogs(id);
+        
         await this.saveProcessConfigs();
+        await this.removeDesiredState(id);
 
         this.logger.info(
           `Successfully deleted process with id '${id}' after stopping failure`,
@@ -308,14 +431,49 @@ export class ProcessManager extends EventEmitter {
    * Get a list of all process infos
    */
   public list(): IProcessInfo[] {
-    return Array.from(this.processInfo.values());
+    const infos = Array.from(this.processInfo.values());
+    
+    // Enrich with live data from monitors
+    for (const info of infos) {
+      const monitor = this.processes.get(info.id);
+      if (monitor) {
+        // Update with current PID if the monitor is running
+        const pid = monitor.getPid();
+        if (pid) {
+          info.pid = pid;
+        } else {
+          info.pid = undefined;
+        }
+        
+        // Update uptime if available
+        const uptime = monitor.getUptime();
+        if (uptime !== null) {
+          info.uptime = uptime;
+        }
+        
+        // Update memory and cpu from latest monitor readings
+        info.memory = monitor.getLastMemoryUsage();
+        const cpu = monitor.getLastCpuUsage();
+        if (Number.isFinite(cpu)) {
+          info.cpu = cpu;
+        }
+        
+        // Update restart count
+        info.restarts = monitor.getRestartCount();
+        
+        // Update status based on actual running state
+        info.status = monitor.isRunning() ? 'online' : 'stopped';
+      }
+    }
+    
+    return infos;
   }
 
   /**
    * Get detailed info for a specific process
    */
   public describe(
-    id: string,
+    id: ProcessId,
   ): { config: IProcessConfig; info: IProcessInfo } | null {
     const config = this.processConfigs.get(id);
     const info = this.processInfo.get(id);
@@ -330,13 +488,21 @@ export class ProcessManager extends EventEmitter {
   /**
    * Get process logs
    */
-  public getLogs(id: string, limit?: number): IProcessLog[] {
+  public getLogs(id: ProcessId, limit?: number): IProcessLog[] {
+    // Get logs from the ProcessMonitor instance
     const monitor = this.processes.get(id);
-    if (!monitor) {
-      return [];
+    
+    if (monitor) {
+      const logs = monitor.getLogs(limit);
+      return logs;
     }
     
-    return monitor.getLogs(limit);
+    // Fallback to stored logs if monitor doesn't exist
+    const logs = this.processLogs.get(id) || [];
+    if (limit && limit > 0) {
+      return logs.slice(-limit);
+    }
+    return logs;
   }
 
   /**
@@ -344,8 +510,12 @@ export class ProcessManager extends EventEmitter {
    */
   public async startAll(): Promise<void> {
     for (const [id, config] of this.processConfigs.entries()) {
-      if (!this.processes.has(id)) {
+      const monitor = this.processes.get(id);
+      if (!monitor) {
         await this.start(config);
+      } else if (!monitor.isRunning()) {
+        // If a monitor exists but is not running, restart the process to ensure a clean start
+        await this.restart(id);
       }
     }
   }
@@ -371,7 +541,7 @@ export class ProcessManager extends EventEmitter {
   /**
    * Update the info for a process
    */
-  private updateProcessInfo(id: string, update: Partial<IProcessInfo>): void {
+  private updateProcessInfo(id: ProcessId, update: Partial<IProcessInfo>): void {
     const info = this.processInfo.get(id);
     if (info) {
       this.processInfo.set(id, { ...info, ...update });
@@ -381,15 +551,40 @@ export class ProcessManager extends EventEmitter {
   /**
    * Compute next sequential numeric id based on existing configs
    */
-  private getNextSequentialId(): number {
-    let maxId = 0;
-    for (const id of this.processConfigs.keys()) {
-      const n = parseInt(id, 10);
-      if (!isNaN(n)) {
-        maxId = Math.max(maxId, n);
+  /**
+   * Sync process stats from monitors to processInfo
+   */
+  public syncProcessStats(): void {
+    for (const [id, monitor] of this.processes.entries()) {
+      const info = this.processInfo.get(id);
+      if (info) {
+        const pid = monitor.getPid();
+        const updates: Partial<IProcessInfo> = {};
+        
+        // Update PID if available
+        if (pid) {
+          updates.pid = pid;
+        }
+        
+        // Update uptime if available
+        const uptime = monitor.getUptime();
+        if (uptime !== null) {
+          updates.uptime = uptime;
+        }
+        
+        // Update restart count
+        updates.restarts = monitor.getRestartCount();
+        
+        // Update status based on actual running state
+        updates.status = monitor.isRunning() ? 'online' : 'stopped';
+        
+        this.updateProcessInfo(id, updates);
       }
     }
-    return maxId + 1;
+  }
+
+  private getNextSequentialId(): ProcessId {
+    return getNextProcessId(this.processConfigs.keys());
   }
 
   /**
@@ -415,6 +610,82 @@ export class ProcessManager extends EventEmitter {
     }
   }
 
+  // === Desired state persistence ===
+  private async saveDesiredStates(): Promise<void> {
+    try {
+      const obj: Record<string, IProcessInfo['status']> = {};
+      for (const [id, state] of this.desiredStates.entries()) {
+        obj[String(id)] = state;
+      }
+      await this.config.writeKey(
+        this.desiredStateStorageKey,
+        JSON.stringify(obj),
+      );
+    } catch (error: any) {
+      this.logger.warn(
+        `Failed to save desired states: ${error?.message || String(error)}`,
+      );
+    }
+  }
+
+  public async loadDesiredStates(): Promise<void> {
+    try {
+      const raw = await this.config.readKey(this.desiredStateStorageKey);
+      if (raw) {
+        const obj = JSON.parse(raw) as Record<string, IProcessInfo['status']>;
+        this.desiredStates = new Map(
+          Object.entries(obj).map(([k, v]) => [toProcessId(k), v] as const)
+        );
+        this.logger.debug(
+          `Loaded desired states for ${this.desiredStates.size} processes`,
+        );
+      }
+    } catch (error: any) {
+      this.logger.warn(
+        `Failed to load desired states: ${error?.message || String(error)}`,
+      );
+    }
+  }
+
+  public async setDesiredState(
+    id: ProcessId,
+    state: IProcessInfo['status'],
+  ): Promise<void> {
+    this.desiredStates.set(id, state);
+    await this.saveDesiredStates();
+  }
+
+  public async removeDesiredState(id: ProcessId): Promise<void> {
+    this.desiredStates.delete(id);
+    await this.saveDesiredStates();
+  }
+
+  public async setDesiredStateForAll(
+    state: IProcessInfo['status'],
+  ): Promise<void> {
+    for (const id of this.processConfigs.keys()) {
+      this.desiredStates.set(id, state);
+    }
+    await this.saveDesiredStates();
+  }
+
+  public async startDesired(): Promise<void> {
+    for (const [id, config] of this.processConfigs.entries()) {
+      const desired = this.desiredStates.get(id);
+      if (desired === 'online' && !this.processes.has(id)) {
+        try {
+          await this.start(config);
+        } catch (e) {
+          this.logger.warn(
+            `Failed to start desired process ${id}: ${
+              (e as Error)?.message || String(e)
+            }`,
+          );
+        }
+      }
+    }
+  }
+
   /**
    * Load process configurations from config storage
    */
@@ -425,23 +696,35 @@ export class ProcessManager extends EventEmitter {
       const configsJson = await this.config.readKey(this.configStorageKey);
       if (configsJson) {
         try {
-          const configs = JSON.parse(configsJson) as IProcessConfig[];
-          this.logger.debug(`Loaded ${configs.length} process configurations`);
+          const parsed = JSON.parse(configsJson) as Array<any>;
+          this.logger.debug(`Loaded ${parsed.length} process configurations`);
 
-          for (const config of configs) {
-            // Validate config
-            if (!config.id || !config.command || !config.projectDir) {
+          for (const raw of parsed) {
+            // Convert legacy string IDs to ProcessId
+            let id: ProcessId;
+            try {
+              id = toProcessId(raw.id);
+            } catch {
               this.logger.warn(
-                `Skipping invalid process config for id '${config.id || 'unknown'}'`,
+                `Skipping invalid process config with non-numeric id '${raw.id || 'unknown'}'`,
               );
               continue;
             }
             
-            this.processConfigs.set(config.id, config);
+            // Validate config
+            if (!id || !raw.command || !raw.projectDir) {
+              this.logger.warn(
+                `Skipping invalid process config for id '${id || 'unknown'}'`,
+              );
+              continue;
+            }
+            
+            const config: IProcessConfig = { ...raw, id };
+            this.processConfigs.set(id, config);
 
             // Initialize process info
-            this.processInfo.set(config.id, {
-              id: config.id,
+            this.processInfo.set(id, {
+              id: id,
               status: 'stopped',
               memory: 0,
               restarts: 0,
@@ -456,7 +739,8 @@ export class ProcessManager extends EventEmitter {
           throw configError;
         }
       } else {
-        this.logger.info('No saved process configurations found');
+        // First run / no configs yet — keep this quiet unless debugging
+        this.logger.debug('No saved process configurations found');
       }
     } catch (error: Error | unknown) {
       // Only throw if it's not the "no configs found" case
@@ -465,9 +749,52 @@ export class ProcessManager extends EventEmitter {
       }
 
       // If no configs found or error reading, just continue with empty configs
-      this.logger.info(
-        'No saved process configurations found or error reading them',
-      );
+      this.logger.debug('No saved process configurations found or error reading them');
     }
   }
+
+  /**
+   * Reset: stop all running processes and clear all saved configurations
+   */
+  public async reset(): Promise<{
+    stopped: ProcessId[];
+    removed: ProcessId[];
+    failed: Array<{ id: ProcessId; error: string }>;
+  }> {
+    this.logger.info('Resetting TSPM: stopping all processes and clearing configs');
+
+    const removed = Array.from(this.processConfigs.keys());
+    const stopped: ProcessId[] = [];
+    const failed: Array<{ id: ProcessId; error: string }> = [];
+
+    // Attempt to stop all currently running processes with per-id error collection
+    for (const id of Array.from(this.processes.keys())) {
+      try {
+        await this.stop(id);
+        stopped.push(id);
+      } catch (error: any) {
+        failed.push({ id, error: error?.message || String(error) });
+      }
+    }
+
+    // Clear in-memory maps regardless of stop outcomes
+    this.processes.clear();
+    this.processInfo.clear();
+    this.processConfigs.clear();
+    this.desiredStates.clear();
+
+    // Remove persisted configs
+    try {
+      await this.config.deleteKey(this.configStorageKey);
+      await this.config.deleteKey(this.desiredStateStorageKey).catch(() => {});
+      this.logger.debug('Cleared persisted process configurations');
+    } catch (error) {
+      // Fallback: write empty list if deleteKey fails for any reason
+      this.logger.warn('deleteKey failed, writing empty process list instead');
+      await this.saveProcessConfigs().catch(() => {});
+    }
+
+    this.logger.info('TSPM reset complete');
+    return { stopped, removed, failed };
+  }
 }

ts/daemon/processmonitor.ts

@@ -1,8 +1,11 @@
 import * as plugins from '../plugins.js';
 import { EventEmitter } from 'events';
 import { ProcessWrapper } from './processwrapper.js';
+import { LogPersistence } from './logpersistence.js';
+import { CrashLogManager } from './crashlogmanager.js';
 import { Logger, ProcessError, handleError } from '../shared/common/utils.errorhandler.js';
 import type { IMonitorConfig, IProcessLog } from '../shared/protocol/ipc.types.js';
+import type { ProcessId } from '../shared/protocol/id.js';
 
 export class ProcessMonitor extends EventEmitter {
   private processWrapper: ProcessWrapper | null = null;
@@ -11,14 +14,57 @@ export class ProcessMonitor extends EventEmitter {
   private stopped: boolean = true; // Initially stopped until start() is called
   private restartCount: number = 0;
   private logger: Logger;
+  private logs: IProcessLog[] = [];
+  private logPersistence: LogPersistence;
+  private crashLogManager: CrashLogManager;
+  private processId?: ProcessId;
+  private currentLogMemorySize: number = 0;
+  private readonly MAX_LOG_MEMORY_SIZE = 10 * 1024 * 1024; // 10MB
+  // Track approximate size per log to avoid O(n) JSON stringify on every update
+  private logSizeMap: WeakMap<IProcessLog, number> = new WeakMap();
+  private restartTimer: NodeJS.Timeout | null = null;
+  private lastRetryAt: number | null = null;
+  private readonly MAX_RETRIES = 10;
+  private readonly RESET_WINDOW_MS = 60 * 60 * 1000; // 1 hour
+  private lastMemoryUsage: number = 0;
+  private lastCpuUsage: number = 0;
+  // Store event listeners for cleanup
+  private logHandler?: (log: IProcessLog) => void;
+  private startHandler?: (pid: number) => void;
+  private exitHandler?: (code: number | null, signal: string | null) => Promise<void>;
+  private errorHandler?: (error: Error | ProcessError) => Promise<void>;
 
-  constructor(config: IMonitorConfig) {
+  constructor(config: IMonitorConfig & { id?: ProcessId }) {
     super();
     this.config = config;
     this.logger = new Logger(`ProcessMonitor:${config.name || 'unnamed'}`);
+    this.logs = [];
+    this.logPersistence = new LogPersistence();
+    this.crashLogManager = new CrashLogManager();
+    this.processId = config.id;
+    this.currentLogMemorySize = 0;
   }
 
-  public start(): void {
+  public async start(): Promise<void> {
+    // Load previously persisted logs if available
+    if (this.processId) {
+      const persistedLogs = await this.logPersistence.loadLogs(this.processId);
+      if (persistedLogs.length > 0) {
+        this.logs = persistedLogs;
+        // Recalculate size once from scratch and seed the size map
+        this.currentLogMemorySize = 0;
+        for (const log of this.logs) {
+          const size = this.estimateLogSize(log);
+          this.logSizeMap.set(log, size);
+          this.currentLogMemorySize += size;
+        }
+        this.logger.info(`Loaded ${persistedLogs.length} persisted logs from disk`);
+        
+        // Delete the persisted file after loading
+        await this.logPersistence.deleteLogs(this.processId);
+      }
+    }
+
     // Reset the stopped flag so that new processes can spawn.
     this.stopped = false;
     this.log(`Starting process monitor.`);
@@ -45,6 +91,14 @@ export class ProcessMonitor extends EventEmitter {
 
     this.logger.info(`Spawning process: ${this.config.command}`);
 
+    // Clear any orphaned pidusage cache entries before spawning
+    try {
+      (plugins.pidusage as any)?.clearAll?.();
+    } catch {}
+
+    // Clean up previous listeners if any
+    this.cleanupListeners();
+
     // Create a new process wrapper
     this.processWrapper = new ProcessWrapper({
       name: this.config.name || 'unnamed-process',
@@ -56,7 +110,33 @@ export class ProcessMonitor extends EventEmitter {
     });
 
     // Set up event handlers
-    this.processWrapper.on('log', (log: IProcessLog): void => {
+    this.logHandler = (log: IProcessLog): void => {
+      // Store the log in our buffer
+      this.logs.push(log);
+      if (process.env.TSPM_DEBUG) {
+        console.error(
+          `[ProcessMonitor:${this.config.name}] Received log (type=${log.type}): ${log.message}`,
+        );
+        console.error(
+          `[ProcessMonitor:${this.config.name}] Logs array now has ${this.logs.length} items`,
+        );
+      }
+      this.logger.debug(`ProcessMonitor received log: ${log.message}`);
+      
+      // Update memory size tracking incrementally
+      const approxSize = this.estimateLogSize(log);
+      this.logSizeMap.set(log, approxSize);
+      this.currentLogMemorySize += approxSize;
+      
+      // Trim logs if they exceed memory limit (10MB)
+      while (this.currentLogMemorySize > this.MAX_LOG_MEMORY_SIZE && this.logs.length > 1) {
+        // Remove oldest logs until we're under the memory limit
+        const removed = this.logs.shift()!;
+        const removedSize = this.logSizeMap.get(removed) ?? this.estimateLogSize(removed);
+        this.logSizeMap.delete(removed); // Clean up map entry to prevent memory leak
+        this.currentLogMemorySize -= removedSize;
+      }
+      
       // Re-emit the log event for upstream handlers
       this.emit('log', log);
 
@@ -64,29 +144,73 @@ export class ProcessMonitor extends EventEmitter {
       if (log.type === 'system') {
         this.log(log.message);
       }
-    });
+    };
+    this.processWrapper.on('log', this.logHandler);
     
-    this.processWrapper.on(
-      'exit',
-      (code: number | null, signal: string | null): void => {
+    // Re-emit start event with PID for upstream handlers
+    this.startHandler = (pid: number): void => {
+      this.emit('start', pid);
+    };
+    this.processWrapper.on('start', this.startHandler);
+
+    this.exitHandler = async (code: number | null, signal: string | null): Promise<void> => {
         const exitMsg = `Process exited with code ${code}, signal ${signal}.`;
         this.logger.info(exitMsg);
         this.log(exitMsg);
         
+        // Clear pidusage internal state for this PID to prevent memory leaks
+        try {
+          const pidToClear = this.processWrapper?.getPid();
+          if (pidToClear) {
+            (plugins.pidusage as any)?.clear?.(pidToClear);
+          }
+        } catch {}
+        
+        // Detect if this was a crash (non-zero exit code or killed by signal)
+        const isCrash = (code !== null && code !== 0) || signal !== null;
+        
+        // Save crash log if this was a crash
+        if (isCrash && this.processId && this.config.name) {
+          try {
+            await this.crashLogManager.saveCrashLog(
+              this.processId,
+              this.config.name,
+              this.logs,
+              code,
+              signal,
+              this.restartCount,
+              this.lastMemoryUsage
+            );
+            this.logger.info(`Saved crash log for process ${this.config.name}`);
+          } catch (error) {
+            this.logger.error(`Failed to save crash log: ${error}`);
+          }
+        }
+        
+        // Flush logs to disk on exit
+        if (this.processId && this.logs.length > 0) {
+          try {
+            await this.logPersistence.saveLogs(this.processId, this.logs);
+            this.logger.debug(`Flushed ${this.logs.length} logs to disk on exit`);
+          } catch (error) {
+            this.logger.error(`Failed to flush logs to disk on exit: ${error}`);
+          }
+        }
+        
+        // Re-emit exit event for upstream handlers
+        this.emit('exit', code, signal);
+
         if (!this.stopped) {
-          this.logger.info('Restarting process...');
-          this.log('Restarting process...');
-          this.restartCount++;
-          this.spawnProcess();
+          this.scheduleRestart('exit');
         } else {
           this.logger.debug(
             'Not restarting process because monitor is stopped',
           );
         }
-      },
-    );
+      };
+    this.processWrapper.on('exit', this.exitHandler);
 
-    this.processWrapper.on('error', (error: Error | ProcessError): void => {
+    this.errorHandler = async (error: Error | ProcessError): Promise<void> => {
       const errorMsg =
         error instanceof ProcessError
           ? `Process error: ${error.toString()}`
@@ -95,15 +219,41 @@ export class ProcessMonitor extends EventEmitter {
       this.logger.error(error);
       this.log(errorMsg);
 
+      // Save crash log for errors
+      if (this.processId && this.config.name) {
+        try {
+          await this.crashLogManager.saveCrashLog(
+            this.processId,
+            this.config.name,
+            this.logs,
+            null, // no exit code for errors
+            null, // no signal for errors
+            this.restartCount,
+            this.lastMemoryUsage
+          );
+          this.logger.info(`Saved crash log for process ${this.config.name} due to error`);
+        } catch (crashLogError) {
+          this.logger.error(`Failed to save crash log: ${crashLogError}`);
+        }
+      }
+
+      // Flush logs to disk on error
+      if (this.processId && this.logs.length > 0) {
+        try {
+          await this.logPersistence.saveLogs(this.processId, this.logs);
+          this.logger.debug(`Flushed ${this.logs.length} logs to disk on error`);
+        } catch (flushError) {
+          this.logger.error(`Failed to flush logs to disk on error: ${flushError}`);
+        }
+      }
+
       if (!this.stopped) {
-        this.logger.info('Restarting process due to error...');
-        this.log('Restarting process due to error...');
-        this.restartCount++;
-        this.spawnProcess();
+        this.scheduleRestart('error');
       } else {
         this.logger.debug('Not restarting process because monitor is stopped');
       }
-    });
+    };
+    this.processWrapper.on('error', this.errorHandler);
 
     // Start the process
     try {
@@ -117,6 +267,74 @@ export class ProcessMonitor extends EventEmitter {
     }
   }
 
+  /**
+   * Clean up event listeners from process wrapper
+   */
+  private cleanupListeners(): void {
+    if (this.processWrapper) {
+      if (this.logHandler) {
+        this.processWrapper.removeListener('log', this.logHandler);
+      }
+      if (this.startHandler) {
+        this.processWrapper.removeListener('start', this.startHandler);
+      }
+      if (this.exitHandler) {
+        this.processWrapper.removeListener('exit', this.exitHandler);
+      }
+      if (this.errorHandler) {
+        this.processWrapper.removeListener('error', this.errorHandler);
+      }
+    }
+    // Clear references
+    this.logHandler = undefined;
+    this.startHandler = undefined;
+    this.exitHandler = undefined;
+    this.errorHandler = undefined;
+  }
+
+  /**
+   * Schedule a restart with incremental debounce and failure cutoff.
+   */
+  private scheduleRestart(reason: 'exit' | 'error'): void {
+    const now = Date.now();
+    // Reset window: if last retry was more than 1 hour ago, reset counter
+    if (this.lastRetryAt && now - this.lastRetryAt >= this.RESET_WINDOW_MS) {
+      this.logger.info('Resetting retry counter after 1 hour window');
+      this.restartCount = 0;
+    }
+
+    // Already at or above max retries?
+    if (this.restartCount >= this.MAX_RETRIES) {
+      const msg = 'Maximum restart attempts reached. Marking process as failed.';
+      this.logger.warn(msg);
+      this.log(msg);
+      this.stopped = true;
+      // Emit a specific event so manager can set status to errored
+      this.emit('failed');
+      return;
+    }
+
+    // Increment and compute delay (1..10 seconds)
+    this.restartCount++;
+    const delaySec = Math.min(this.restartCount, 10);
+    const msg = `Restarting process in ${delaySec}s (attempt ${this.restartCount}/${this.MAX_RETRIES}) due to ${reason}...`;
+    this.logger.info(msg);
+    this.log(msg);
+
+    // Clear existing timer if any, then schedule
+    if (this.restartTimer) {
+      clearTimeout(this.restartTimer);
+    }
+    this.lastRetryAt = now;
+    this.restartTimer = setTimeout(() => {
+      // If stopped in the meantime, do not spawn
+      if (this.stopped) {
+        return;
+      }
+      this.spawnProcess();
+    }, delaySec * 1000);
+  }
+
   /**
    * Monitor the process group's memory usage. If the total memory exceeds the limit,
    * kill the process group so that the 'exit' handler can restart it.
@@ -126,18 +344,24 @@ export class ProcessMonitor extends EventEmitter {
     memoryLimit: number,
   ): Promise<void> {
     try {
-      const memoryUsage = await this.getProcessGroupMemory(pid);
+      const { memory: memoryUsage, cpu: cpuUsage } = await this.getProcessGroupStats(pid);
 
       this.logger.debug(
         `Memory usage for PID ${pid}: ${this.humanReadableBytes(memoryUsage)} (${memoryUsage} bytes)`,
       );
 
-      // Only log to the process log at longer intervals to avoid spamming
-      this.log(
-        `Current memory usage for process group (PID ${pid}): ${this.humanReadableBytes(
-          memoryUsage,
-        )} (${memoryUsage} bytes)`,
-      );
+      // Store latest readings
+      this.lastMemoryUsage = memoryUsage;
+      this.lastCpuUsage = cpuUsage;
+
+      // Only log memory usage in debug mode to avoid spamming
+      if (process.env.TSPM_DEBUG) {
+        this.log(
+          `Current memory usage for process group (PID ${pid}): ${this.humanReadableBytes(
+            memoryUsage,
+          )} (${memoryUsage} bytes)`,
+        );
+      }
 
       if (memoryUsage > memoryLimit) {
         const memoryLimitMsg = `Memory usage ${this.humanReadableBytes(
@@ -149,7 +373,7 @@ export class ProcessMonitor extends EventEmitter {
 
         // Stop the process wrapper, which will trigger the exit handler and restart
         if (this.processWrapper) {
-          this.processWrapper.stop();
+          await this.processWrapper.stop();
         }
       }
     } catch (error: Error | unknown) {
@@ -167,7 +391,7 @@ export class ProcessMonitor extends EventEmitter {
   /**
    * Get the total memory usage (in bytes) for the process group (the main process and its children).
    */
-  private getProcessGroupMemory(pid: number): Promise<number> {
+  private getProcessGroupStats(pid: number): Promise<{ memory: number; cpu: number }> {
     return new Promise((resolve, reject) => {
       this.logger.debug(
         `Getting memory usage for process group with PID ${pid}`,
@@ -175,7 +399,7 @@ export class ProcessMonitor extends EventEmitter {
 
       plugins.psTree(
         pid,
-        (err: Error | null, children: Array<{ PID: string }>) => {
+        (err: any, children: ReadonlyArray<{ PID: string }>) => {
           if (err) {
             const processError = new ProcessError(
               `Failed to get process tree: ${err.message}`,
@@ -197,7 +421,7 @@ export class ProcessMonitor extends EventEmitter {
 
           plugins.pidusage(
             pids,
-            (err: Error | null, stats: Record<string, { memory: number }>) => {
+            (err: Error | null, stats: Record<string, { memory: number; cpu: number }>) => {
               if (err) {
                 const processError = new ProcessError(
                   `Failed to get process usage stats: ${err.message}`,
@@ -209,14 +433,22 @@ export class ProcessMonitor extends EventEmitter {
               }
 
               let totalMemory = 0;
+              let totalCpu = 0;
               for (const key in stats) {
-                totalMemory += stats[key].memory;
+                // Check if stats[key] exists and is not null (process may have exited)
+                if (stats[key]) {
+                  totalMemory += stats[key].memory || 0;
+                  totalCpu += Number.isFinite(stats[key].cpu) ? stats[key].cpu : 0;
+                } else {
+                  this.logger.debug(`Process ${key} stats are null (process may have exited)`);
+                }
               }
 
               this.logger.debug(
                 `Total memory for process group: ${this.humanReadableBytes(totalMemory)}`,
               );
-              resolve(totalMemory);
+              
+              resolve({ memory: totalMemory, cpu: totalCpu });
             },
           );
         },
@@ -239,14 +471,40 @@ export class ProcessMonitor extends EventEmitter {
   /**
    * Stop the monitor and prevent any further respawns.
    */
-  public stop(): void {
+  public async stop(): Promise<void> {
     this.log('Stopping process monitor.');
     this.stopped = true;
+    
+    // Clean up event listeners
+    this.cleanupListeners();
+    
+    // Flush logs to disk before stopping
+    if (this.processId && this.logs.length > 0) {
+      try {
+        await this.logPersistence.saveLogs(this.processId, this.logs);
+        this.logger.info(`Flushed ${this.logs.length} logs to disk on stop`);
+      } catch (error) {
+        this.logger.error(`Failed to flush logs to disk on stop: ${error}`);
+      }
+    }
+    
     if (this.intervalId) {
       clearInterval(this.intervalId);
     }
+    // Cancel any pending restart timer
+    if (this.restartTimer) {
+      clearTimeout(this.restartTimer);
+      this.restartTimer = null;
+    }
     if (this.processWrapper) {
-      this.processWrapper.stop();
+      // Clear pidusage state for current PID before stopping to avoid leaks
+      try {
+        const pidToClear = this.processWrapper.getPid();
+        if (pidToClear) {
+          (plugins.pidusage as any)?.clear?.(pidToClear);
+        }
+      } catch {}
+      await this.processWrapper.stop();
     }
   }
 
@@ -254,10 +512,16 @@ export class ProcessMonitor extends EventEmitter {
    * Get the current logs from the process
    */
   public getLogs(limit?: number): IProcessLog[] {
-    if (!this.processWrapper) {
-      return [];
+    if (process.env.TSPM_DEBUG) {
+      console.error(
+        `[ProcessMonitor:${this.config.name}] getLogs called, logs.length=${this.logs.length}, limit=${limit}`,
+      );
     }
-    return this.processWrapper.getLogs(limit);
+    this.logger.debug(`Getting logs, total stored: ${this.logs.length}`);
+    if (limit && limit > 0) {
+      return this.logs.slice(-limit);
+    }
+    return this.logs;
   }
 
   /**
@@ -288,6 +552,20 @@ export class ProcessMonitor extends EventEmitter {
     return this.processWrapper?.isRunning() || false;
   }
 
+  /**
+   * Get last measured memory usage for the process group (bytes)
+   */
+  public getLastMemoryUsage(): number {
+    return this.lastMemoryUsage;
+  }
+
+  /**
+   * Get last measured CPU usage for the process group (sum of group, percent)
+   */
+  public getLastCpuUsage(): number {
+    return this.lastCpuUsage;
+  }
+
   /**
    * Helper method for logging messages with the instance name.
    */
@@ -295,4 +573,17 @@ export class ProcessMonitor extends EventEmitter {
     const prefix = this.config.name ? `[${this.config.name}] ` : '';
     console.log(prefix + message);
   }
+
+  /**
+   * Estimate approximate memory size in bytes for a log entry.
+   * Keeps CPU low by avoiding JSON.stringify on the full array.
+   */
+  private estimateLogSize(log: IProcessLog): number {
+    const messageBytes = Buffer.byteLength(log.message || '', 'utf8');
+    const typeBytes = Buffer.byteLength(log.type || '', 'utf8');
+    const runIdBytes = Buffer.byteLength((log as any).runId || '', 'utf8');
+    // Rough overhead for object structure, keys, timestamp/seq values
+    const overhead = 64;
+    return messageBytes + typeBytes + runIdBytes + overhead;
+  }
 }

ts/daemon/processwrapper.ts

@@ -21,6 +21,35 @@ export class ProcessWrapper extends EventEmitter {
   private logger: Logger;
   private nextSeq: number = 0;
   private runId: string = '';
+  private stdoutRemainder: string = '';
+  private stderrRemainder: string = '';
+  // Store event handlers for cleanup
+  private exitHandler?: (code: number | null, signal: string | null) => void;
+  private errorHandler?: (error: Error) => void;
+  private stdoutDataHandler?: (data: Buffer) => void;
+  private stdoutEndHandler?: () => void;
+  private stderrDataHandler?: (data: Buffer) => void;
+  private stderrEndHandler?: () => void;
+  
+  // Helper: send a signal to the process and all its children (best-effort)
+  private async killProcessTree(signal: NodeJS.Signals): Promise<void> {
+    if (!this.process || !this.process.pid) return;
+    const rootPid = this.process.pid;
+    await new Promise<void>((resolve) => {
+      plugins.psTree(rootPid, (err: any, children: ReadonlyArray<{ PID: string }>) => {
+        const pids: number[] = [rootPid, ...children.map((c) => Number(c.PID)).filter((n) => Number.isFinite(n))];
+        for (const pid of pids) {
+          try {
+            // Always signal individual PIDs to avoid accidentally targeting unrelated groups
+            process.kill(pid, signal);
+          } catch {
+            // ignore ESRCH/EPERM
+          }
+        }
+        resolve();
+      });
+    });
+  }
 
   constructor(options: IProcessWrapperOptions) {
     super();
@@ -45,7 +74,7 @@ export class ProcessWrapper extends EventEmitter {
           this.options.args,
           {
             cwd: this.options.cwd,
-            env: this.options.env || process.env,
+            env: { ...process.env, ...(this.options.env || {}) },
             stdio: ['ignore', 'pipe', 'pipe'], // We need to pipe stdout and stderr
           },
         );
@@ -53,7 +82,7 @@ export class ProcessWrapper extends EventEmitter {
         // Use shell mode to allow a full command string
         this.process = plugins.childProcess.spawn(this.options.command, {
           cwd: this.options.cwd,
-          env: this.options.env || process.env,
+          env: { ...process.env, ...(this.options.env || {}) },
           stdio: ['ignore', 'pipe', 'pipe'], // We need to pipe stdout and stderr
           shell: true,
         });
@@ -62,15 +91,24 @@ export class ProcessWrapper extends EventEmitter {
       this.startTime = new Date();
 
       // Handle process exit
-      this.process.on('exit', (code, signal) => {
+      this.exitHandler = (code, signal) => {
         const exitMessage = `Process exited with code ${code}, signal ${signal}`;
         this.logger.info(exitMessage);
         this.addSystemLog(exitMessage);
+        
+        // Clear remainder buffers on exit
+        this.stdoutRemainder = '';
+        this.stderrRemainder = '';
+        
+        // Mark process reference as gone so isRunning() reflects reality
+        this.process = null;
+        
         this.emit('exit', code, signal);
-      });
+      };
+      this.process.on('exit', this.exitHandler);
 
       // Handle errors
-      this.process.on('error', (error) => {
+      this.errorHandler = (error) => {
         const processError = new ProcessError(
           error.message,
           'ERR_PROCESS_EXECUTION',
@@ -79,30 +117,80 @@ export class ProcessWrapper extends EventEmitter {
         this.logger.error(processError);
         this.addSystemLog(`Process error: ${processError.toString()}`);
         this.emit('error', processError);
-      });
+      };
+      this.process.on('error', this.errorHandler);
 
       // Capture stdout
       if (this.process.stdout) {
-        this.process.stdout.on('data', (data) => {
-          const lines = data.toString().split('\n');
-          for (const line of lines) {
-            if (line.trim()) {
-              this.addLog('stdout', line);
-            }
+        if (process.env.TSPM_DEBUG) {
+          console.error(
+            `[ProcessWrapper] Setting up stdout listener for process ${this.process.pid}`,
+          );
+        }
+        this.stdoutDataHandler = (data) => {
+          if (process.env.TSPM_DEBUG) {
+            console.error(
+              `[ProcessWrapper] Received stdout data from PID ${this.process?.pid}: ${data
+                .toString()
+                .substring(0, 100)}`,
+            );
           }
-        });
+          // Add data to remainder buffer and split by newlines
+          const text = this.stdoutRemainder + data.toString();
+          const lines = text.split('\n');
+          
+          // The last element might be a partial line
+          this.stdoutRemainder = lines.pop() || '';
+          
+          // Process complete lines
+          for (const line of lines) {
+            if (process.env.TSPM_DEBUG) {
+              console.error(`[ProcessWrapper] Processing stdout line: ${line}`);
+            }
+            this.logger.debug(`Captured stdout: ${line}`);
+            this.addLog('stdout', line);
+          }
+        };
+        this.process.stdout.on('data', this.stdoutDataHandler);
+        
+        // Flush remainder on stream end
+        this.stdoutEndHandler = () => {
+          if (this.stdoutRemainder) {
+            this.logger.debug(`Flushing stdout remainder: ${this.stdoutRemainder}`);
+            this.addLog('stdout', this.stdoutRemainder);
+            this.stdoutRemainder = '';
+          }
+        };
+        this.process.stdout.on('end', this.stdoutEndHandler);
+      } else {
+        this.logger.warn('Process stdout is null');
       }
 
       // Capture stderr
       if (this.process.stderr) {
-        this.process.stderr.on('data', (data) => {
-          const lines = data.toString().split('\n');
+        this.stderrDataHandler = (data) => {
+          // Add data to remainder buffer and split by newlines
+          const text = this.stderrRemainder + data.toString();
+          const lines = text.split('\n');
+          
+          // The last element might be a partial line
+          this.stderrRemainder = lines.pop() || '';
+          
+          // Process complete lines
           for (const line of lines) {
-            if (line.trim()) {
-              this.addLog('stderr', line);
-            }
+            this.addLog('stderr', line);
           }
-        });
+        };
+        this.process.stderr.on('data', this.stderrDataHandler);
+        
+        // Flush remainder on stream end
+        this.stderrEndHandler = () => {
+          if (this.stderrRemainder) {
+            this.addLog('stderr', this.stderrRemainder);
+            this.stderrRemainder = '';
+          }
+        };
+        this.process.stderr.on('end', this.stderrEndHandler);
       }
 
       this.addSystemLog(`Process started with PID ${this.process.pid}`);
@@ -125,46 +213,105 @@ export class ProcessWrapper extends EventEmitter {
     }
   }
 
+  /**
+   * Clean up event listeners from process and streams
+   */
+  private cleanupListeners(): void {
+    if (this.process) {
+      if (this.exitHandler) {
+        this.process.removeListener('exit', this.exitHandler);
+      }
+      if (this.errorHandler) {
+        this.process.removeListener('error', this.errorHandler);
+      }
+      
+      if (this.process.stdout) {
+        if (this.stdoutDataHandler) {
+          this.process.stdout.removeListener('data', this.stdoutDataHandler);
+        }
+        if (this.stdoutEndHandler) {
+          this.process.stdout.removeListener('end', this.stdoutEndHandler);
+        }
+      }
+      
+      if (this.process.stderr) {
+        if (this.stderrDataHandler) {
+          this.process.stderr.removeListener('data', this.stderrDataHandler);
+        }
+        if (this.stderrEndHandler) {
+          this.process.stderr.removeListener('end', this.stderrEndHandler);
+        }
+      }
+    }
+    
+    // Clear references
+    this.exitHandler = undefined;
+    this.errorHandler = undefined;
+    this.stdoutDataHandler = undefined;
+    this.stdoutEndHandler = undefined;
+    this.stderrDataHandler = undefined;
+    this.stderrEndHandler = undefined;
+  }
+
   /**
    * Stop the wrapped process
    */
-  public stop(): void {
+  public async stop(): Promise<void> {
     if (!this.process) {
       this.logger.debug('Stop called but no process is running');
       this.addSystemLog('No process running');
       return;
     }
 
+    // Clean up event listeners before stopping
+    this.cleanupListeners();
+
     this.logger.info('Stopping process...');
     this.addSystemLog('Stopping process...');
 
     // First try SIGTERM for graceful shutdown
     if (this.process.pid) {
       try {
-        this.logger.debug(`Sending SIGTERM to process ${this.process.pid}`);
-        process.kill(this.process.pid, 'SIGTERM');
+        this.logger.debug(`Sending SIGTERM to process tree rooted at ${this.process.pid}`);
+        await this.killProcessTree('SIGTERM');
 
-        // Give it 5 seconds to shut down gracefully
-        setTimeout((): void => {
-          if (this.process && this.process.pid) {
+        // If the process already exited, return immediately
+        if (typeof this.process.exitCode === 'number') {
+          this.logger.debug('Process already exited, no need to wait');
+          return;
+        }
+
+        // Wait for exit or escalate
+        await new Promise<void>((resolve) => {
+          let settled = false;
+          const cleanup = () => {
+            if (settled) return;
+            settled = true;
+            resolve();
+          };
+
+          const onExit = () => cleanup();
+          this.process!.once('exit', onExit);
+
+          const killTimer = setTimeout(async () => {
+            if (!this.process || !this.process.pid) return cleanup();
             this.logger.warn(
-              `Process ${this.process.pid} did not exit gracefully, force killing...`,
-            );
-            this.addSystemLog(
-              'Process did not exit gracefully, force killing...',
+              `Process ${this.process.pid} did not exit gracefully, force killing tree...`,
             );
+            this.addSystemLog('Process did not exit gracefully, force killing...');
             try {
-              process.kill(this.process.pid, 'SIGKILL');
-            } catch (error: Error | unknown) {
-              // Process might have exited between checks
-              this.logger.debug(
-                `Failed to send SIGKILL, process probably already exited: ${
-                  error instanceof Error ? error.message : String(error)
-                }`,
-              );
-            }
-          }
-        }, 5000);
+              await this.killProcessTree('SIGKILL');
+            } catch {}
+            // Give a short grace period after SIGKILL
+            setTimeout(() => cleanup(), 500);
+          }, 5000);
+
+          // Safety cap in case neither exit nor timer fires (shouldn't happen)
+          setTimeout(() => {
+            clearTimeout(killTimer);
+            cleanup();
+          }, 10000);
+        });
       } catch (error: Error | unknown) {
         const processError = new ProcessError(
           error instanceof Error ? error.message : String(error),
@@ -181,6 +328,7 @@ export class ProcessWrapper extends EventEmitter {
    * Get the process ID if running
    */
   public getPid(): number | null {
+    if (!this.isRunning()) return null;
     return this.process?.pid || null;
   }
 
@@ -204,7 +352,13 @@ export class ProcessWrapper extends EventEmitter {
    * Check if the process is currently running
    */
   public isRunning(): boolean {
-    return this.process !== null && typeof this.process.exitCode !== 'number';
+    if (!this.process) return false;
+    // In Node, while the child is running: exitCode === null and signalCode === null/undefined
+    // After it exits: exitCode is a number OR signalCode is a string
+    const anyProc: any = this.process as any;
+    const exitCode = anyProc.exitCode;
+    const signalCode = anyProc.signalCode;
+    return exitCode === null && (signalCode === null || typeof signalCode === 'undefined');
   }
 
   /**

ts/daemon/tspm.config.ts

@@ -1,20 +1,20 @@
 import * as plugins from '../plugins.js';
 
 export class TspmConfig {
-  public npmextraInstance = new plugins.npmextra.KeyValueStore({
+  public smartconfigInstance = new plugins.smartconfig.KeyValueStore({
     identityArg: '@git.zone__tspm',
     typeArg: 'userHomeDir',
   });
 
   public async readKey(keyArg: string): Promise<string> {
-    return await this.npmextraInstance.readKey(keyArg);
+    return await this.smartconfigInstance.readKey(keyArg);
   }
 
   public async writeKey(keyArg: string, value: string): Promise<void> {
-    return await this.npmextraInstance.writeKey(keyArg, value);
+    return await this.smartconfigInstance.writeKey(keyArg, value);
   }
 
   public async deleteKey(keyArg: string): Promise<void> {
-    return await this.npmextraInstance.deleteKey(keyArg);
+    return await this.smartconfigInstance.deleteKey(keyArg);
   }
 }

ts/daemon/tspm.daemon.ts

@@ -1,5 +1,7 @@
 import * as plugins from '../plugins.js';
 import * as paths from '../paths.js';
+import { toProcessId } from '../shared/protocol/id.js';
+import type { ProcessId } from '../shared/protocol/id.js';
 import { ProcessManager } from './processmanager.js';
 import type {
   IpcMethodMap,
@@ -8,6 +10,7 @@ import type {
   DaemonStatusResponse,
   HeartbeatResponse,
 } from '../shared/protocol/ipc.types.js';
+import { LogPersistence } from './logpersistence.js';
 
 /**
  * Central daemon server that manages all TSPM processes
@@ -20,12 +23,20 @@ export class TspmDaemon {
   private socketPath: string;
   private heartbeatInterval: NodeJS.Timeout | null = null;
   private daemonPidFile: string;
+  private version: string;
 
   constructor() {
     this.tspmInstance = new ProcessManager();
     this.socketPath = plugins.path.join(paths.tspmDir, 'tspm.sock');
     this.daemonPidFile = plugins.path.join(paths.tspmDir, 'daemon.pid');
     this.startTime = Date.now();
+    // Determine daemon version from package metadata
+    try {
+      const proj = new plugins.projectinfo.ProjectInfo(paths.packageDir);
+      this.version = proj.npm.version || 'unknown';
+    } catch {
+      this.version = 'unknown';
+    }
   }
 
   /**
@@ -81,20 +92,40 @@ export class TspmDaemon {
 
     // Load existing process configurations
     await this.tspmInstance.loadProcessConfigs();
+    await this.tspmInstance.loadDesiredStates();
 
     // Set up log publishing
     this.tspmInstance.on('process:log', ({ processId, log }) => {
       // Publish to topic for this process
       const topic = `logs.${processId}`;
-      // Broadcast to all connected clients subscribed to this topic
+      // Deliver only to subscribed clients
       if (this.ipcServer) {
-        this.ipcServer.broadcast(`topic:${topic}`, log);
+        try {
+          const topicIndex = (this.ipcServer as any).topicIndex as Map<string, Set<string>> | undefined;
+          const subscribers = topicIndex?.get(topic);
+          if (subscribers && subscribers.size > 0) {
+            // Send directly to subscribers for this topic
+            for (const clientId of subscribers) {
+              this.ipcServer
+                .sendToClient(clientId, `topic:${topic}`, log)
+                .catch((err: any) => {
+                  // Surface but don't fail the loop
+                  console.error('[IPC] sendToClient error:', err?.message || err);
+                });
+            }
+          }
+        } catch (err: any) {
+          console.error('[IPC] Topic delivery error:', err?.message || err);
+        }
       }
     });
 
     // Set up graceful shutdown handlers
     this.setupShutdownHandlers();
 
+    // Start processes that should be online per desired state
+    await this.tspmInstance.startDesired();
+
     console.log(`TSPM daemon started successfully on ${this.socketPath}`);
     console.log(`PID: ${process.pid}`);
   }
@@ -108,6 +139,7 @@ export class TspmDaemon {
       'start',
       async (request: RequestForMethod<'start'>) => {
         try {
+          await this.tspmInstance.setDesiredState(request.config.id, 'online');
           await this.tspmInstance.start(request.config);
           const processInfo = this.tspmInstance.processInfo.get(
             request.config.id,
@@ -123,14 +155,60 @@ export class TspmDaemon {
       },
     );
 
+    // Start by id (resolve config on server)
+    this.ipcServer.onMessage(
+      'startById',
+      async (request: RequestForMethod<'startById'>) => {
+        try {
+          const id = toProcessId(request.id);
+          let config = this.tspmInstance.processConfigs.get(id);
+          if (!config) {
+            // Try to reload configs if not found (handles races or stale state)
+            await this.tspmInstance.loadProcessConfigs();
+            config = this.tspmInstance.processConfigs.get(id) || null as any;
+          }
+          if (!config) {
+            throw new Error(`Process ${id} not found`);
+          }
+          await this.tspmInstance.setDesiredState(id, 'online');
+          const existing = this.tspmInstance.processes.get(id);
+          if (existing) {
+            if (existing.isRunning()) {
+              // Already running; return current status/pid
+              const runningInfo = this.tspmInstance.processInfo.get(id);
+              return {
+                processId: id,
+                pid: runningInfo?.pid,
+                status: runningInfo?.status || 'online',
+              };
+            } else {
+              await this.tspmInstance.restart(id);
+            }
+          } else {
+            await this.tspmInstance.start(config);
+          }
+          const processInfo = this.tspmInstance.processInfo.get(id);
+          return {
+            processId: id,
+            pid: processInfo?.pid,
+            status: processInfo?.status || 'stopped',
+          };
+        } catch (error) {
+          throw new Error(`Failed to start process: ${error.message}`);
+        }
+      },
+    );
+
     this.ipcServer.onMessage(
       'stop',
       async (request: RequestForMethod<'stop'>) => {
         try {
-          await this.tspmInstance.stop(request.id);
+          const id = toProcessId(request.id);
+          await this.tspmInstance.setDesiredState(id, 'stopped');
+          await this.tspmInstance.stop(id);
           return {
             success: true,
-            message: `Process ${request.id} stopped successfully`,
+            message: `Process ${id} stopped successfully`,
           };
         } catch (error) {
           throw new Error(`Failed to stop process: ${error.message}`);
@@ -142,10 +220,12 @@ export class TspmDaemon {
       'restart',
       async (request: RequestForMethod<'restart'>) => {
         try {
-          await this.tspmInstance.restart(request.id);
-          const processInfo = this.tspmInstance.processInfo.get(request.id);
+          const id = toProcessId(request.id);
+          await this.tspmInstance.setDesiredState(id, 'online');
+          await this.tspmInstance.restart(id);
+          const processInfo = this.tspmInstance.processInfo.get(id);
           return {
-            processId: request.id,
+            processId: id,
             pid: processInfo?.pid,
             status: processInfo?.status || 'stopped',
           };
@@ -159,10 +239,13 @@ export class TspmDaemon {
       'delete',
       async (request: RequestForMethod<'delete'>) => {
         try {
-          await this.tspmInstance.delete(request.id);
+          const id = toProcessId(request.id);
+          // Ensure desired state reflects stopped before deletion
+          await this.tspmInstance.setDesiredState(id, 'stopped');
+          await this.tspmInstance.delete(id);
           return {
             success: true,
-            message: `Process ${request.id} deleted successfully`,
+            message: `Process ${id} deleted successfully`,
           };
         } catch (error) {
           throw new Error(`Failed to delete process: ${error.message}`);
@@ -185,17 +268,20 @@ export class TspmDaemon {
     );
 
     this.ipcServer.onMessage(
-      'remove',
-      async (request: RequestForMethod<'remove'>) => {
+      'update',
+      async (request: RequestForMethod<'update'>) => {
         try {
-          await this.tspmInstance.delete(request.id);
-          return { success: true, message: `Process ${request.id} deleted successfully` };
+          const id = toProcessId(request.id);
+          const updated = await this.tspmInstance.update(id, request.updates as any);
+          return { id, config: updated };
         } catch (error) {
-          throw new Error(`Failed to remove process: ${error.message}`);
+          throw new Error(`Failed to update process: ${error.message}`);
         }
       },
     );
 
+    // Note: 'remove' is only a CLI alias. Daemon exposes 'delete' only.
+
     this.ipcServer.onMessage(
       'list',
       async (request: RequestForMethod<'list'>) => {
@@ -207,16 +293,15 @@ export class TspmDaemon {
     this.ipcServer.onMessage(
       'describe',
       async (request: RequestForMethod<'describe'>) => {
-        const processInfo = await this.tspmInstance.describe(request.id);
-        const config = this.tspmInstance.processConfigs.get(request.id);
-
-        if (!processInfo || !config) {
-          throw new Error(`Process ${request.id} not found`);
+        const id = toProcessId(request.id);
+        const result = await this.tspmInstance.describe(id);
+        if (!result) {
+          throw new Error(`Process ${id} not found`);
         }
-
+        // Return correctly shaped response
         return {
-          processInfo,
-          config,
+          processInfo: result.info,
+          config: result.config,
         };
       },
     );
@@ -224,18 +309,140 @@ export class TspmDaemon {
     this.ipcServer.onMessage(
       'getLogs',
       async (request: RequestForMethod<'getLogs'>) => {
-        const logs = await this.tspmInstance.getLogs(request.id);
+        const id = toProcessId(request.id);
+        const logs = await this.tspmInstance.getLogs(id, request.lines);
         return { logs };
       },
     );
 
+    // Stream backlog logs and let client subscribe to live topic separately
+    this.ipcServer.onMessage(
+      'logs:subscribe',
+      async (
+        request: RequestForMethod<'logs:subscribe'>,
+        clientId: string,
+      ) => {
+        const id = toProcessId(request.id);
+        // Determine backlog set
+        const allLogs = await this.tspmInstance.getLogs(id);
+        let filtered = allLogs;
+        if (request.types && request.types.length) {
+          filtered = filtered.filter((l) => request.types!.includes(l.type));
+        }
+        if (request.sinceTime && request.sinceTime > 0) {
+          filtered = filtered.filter(
+            (l) => new Date(l.timestamp).getTime() >= request.sinceTime!,
+          );
+        }
+        const lines = request.lines && request.lines > 0 ? request.lines : 0;
+        if (lines > 0 && filtered.length > lines) {
+          filtered = filtered.slice(-lines);
+        }
+
+        // Send backlog entries directly to the requesting client as topic messages
+        // in small batches to avoid overwhelming the transport or client.
+        const chunkSize = 200;
+        for (let i = 0; i < filtered.length; i += chunkSize) {
+          const chunk = filtered.slice(i, i + chunkSize);
+          await Promise.allSettled(
+            chunk.map((entry) =>
+              this.ipcServer.sendToClient(
+                clientId,
+                `topic:logs.backlog.${id}`,
+                {
+                  ...entry,
+                  timestamp: new Date(entry.timestamp).getTime(),
+                },
+              ),
+            ),
+          );
+          // Yield a bit between chunks
+          await new Promise((r) => setTimeout(r, 5));
+        }
+        return { ok: true } as any;
+      },
+    );
+
+    // Inspect subscribers for a process log topic
+    this.ipcServer.onMessage(
+      'logs:subscribers',
+      async (
+        request: RequestForMethod<'logs:subscribers'>,
+        clientId: string,
+      ) => {
+        const id = toProcessId(request.id);
+        const topic = `logs.${id}`;
+        try {
+          const topicIndex = (this.ipcServer as any).topicIndex as Map<string, Set<string>> | undefined;
+          const subs = Array.from(topicIndex?.get(topic) || []);
+          // Also include the requesting clientId if it has a local handler without subscription
+          return { topic, subscribers: subs, count: subs.length } as any;
+        } catch (err: any) {
+          return { topic, subscribers: [], count: 0 } as any;
+        }
+      },
+    );
+
+    // Resolve target (id:n | name:foo | numeric string) to ProcessId
+    this.ipcServer.onMessage(
+      'resolveTarget',
+      async (request: RequestForMethod<'resolveTarget'>) => {
+        const raw = String(request.target || '').trim();
+        if (!raw) {
+          throw new Error('Empty target');
+        }
+
+        // id:<n>
+        if (/^id:\s*\d+$/i.test(raw)) {
+          const idNum = raw.split(':')[1].trim();
+          const id = toProcessId(idNum);
+          const config = this.tspmInstance.processConfigs.get(id);
+          if (!config) throw new Error(`Process ${id} not found`);
+          return { id, name: config.name } as ResponseForMethod<'resolveTarget'>;
+        }
+
+        // name:<label>
+        if (/^name:/i.test(raw)) {
+          const name = raw.slice(raw.indexOf(':') + 1).trim();
+          if (!name) throw new Error('Missing name after name:');
+          const matches = Array.from(this.tspmInstance.processConfigs.values()).filter(
+            (c) => (c.name || '').trim() === name,
+          );
+          if (matches.length === 0) {
+            throw new Error(`No process found with name "${name}"`);
+          }
+          if (matches.length > 1) {
+            const ids = matches.map((c) => String(c.id)).join(', ');
+            throw new Error(
+              `Multiple processes found with name "${name}": ids [${ids}]. Please use id:<n>.`,
+            );
+          }
+          return { id: matches[0].id, name } as ResponseForMethod<'resolveTarget'>;
+        }
+
+        // bare numeric id
+        if (/^\d+$/.test(raw)) {
+          const id = toProcessId(raw);
+          const config = this.tspmInstance.processConfigs.get(id);
+          if (!config) throw new Error(`Process ${id} not found`);
+          return { id, name: config.name } as ResponseForMethod<'resolveTarget'>;
+        }
+
+        // Unknown format
+        throw new Error(
+          'Unsupported target format. Use numeric id (e.g. 1), id:<n> (e.g. id:1), or name:<label> (e.g. name:api).',
+        );
+      },
+    );
+
     // Batch operations handlers
     this.ipcServer.onMessage(
       'startAll',
       async (request: RequestForMethod<'startAll'>) => {
-        const started: string[] = [];
-        const failed: Array<{ id: string; error: string }> = [];
+        const started: ProcessId[] = [];
+        const failed: Array<{ id: ProcessId; error: string }> = [];
 
+        await this.tspmInstance.setDesiredStateForAll('online');
         await this.tspmInstance.startAll();
 
         // Get status of all processes
@@ -254,14 +461,17 @@ export class TspmDaemon {
     this.ipcServer.onMessage(
       'stopAll',
       async (request: RequestForMethod<'stopAll'>) => {
-        const stopped: string[] = [];
-        const failed: Array<{ id: string; error: string }> = [];
+        const stopped: ProcessId[] = [];
+        const failed: Array<{ id: ProcessId; error: string }> = [];
 
+        await this.tspmInstance.setDesiredStateForAll('stopped');
         await this.tspmInstance.stopAll();
+        // Yield briefly to allow any pending exit events to settle
+        await new Promise((r) => setTimeout(r, 50));
 
-        // Get status of all processes
-        for (const [id, processInfo] of this.tspmInstance.processInfo) {
-          if (processInfo.status === 'stopped') {
+        // Determine which monitors are no longer running
+        for (const [id, monitor] of this.tspmInstance.processes) {
+          if (!monitor.isRunning()) {
             stopped.push(id);
           } else {
             failed.push({ id, error: 'Failed to stop' });
@@ -275,8 +485,8 @@ export class TspmDaemon {
     this.ipcServer.onMessage(
       'restartAll',
       async (request: RequestForMethod<'restartAll'>) => {
-        const restarted: string[] = [];
-        const failed: Array<{ id: string; error: string }> = [];
+        const restarted: ProcessId[] = [];
+        const failed: Array<{ id: ProcessId; error: string }> = [];
 
         await this.tspmInstance.restartAll();
 
@@ -293,11 +503,42 @@ export class TspmDaemon {
       },
     );
 
+    // Reset handler: stops all and clears configs
+    this.ipcServer.onMessage(
+      'reset',
+      async (request: RequestForMethod<'reset'>) => {
+        const result = await this.tspmInstance.reset();
+        return result;
+      },
+    );
+
     // Daemon management handlers
     this.ipcServer.onMessage(
       'daemon:status',
       async (request: RequestForMethod<'daemon:status'>) => {
         const memUsage = process.memoryUsage();
+        // Aggregate log stats from monitors
+        let totalLogCount = 0;
+        let totalLogBytes = 0;
+        const perProcess: Array<{ id: ProcessId; count: number; bytes: number }> = [];
+        for (const [id, monitor] of this.tspmInstance.processes.entries()) {
+          try {
+            const logs = monitor.getLogs();
+            const count = logs.length;
+            const bytes = LogPersistence.calculateLogMemorySize(logs);
+            totalLogCount += count;
+            totalLogBytes += bytes;
+            perProcess.push({ id, count, bytes });
+          } catch {}
+        }
+        const pathsInfo = {
+          tspmDir: paths.tspmDir,
+          socketPath: this.socketPath,
+          pidFile: this.daemonPidFile,
+        };
+        const configsInfo = {
+          processConfigs: this.tspmInstance.processConfigs.size,
+        };
         return {
           status: 'running',
           pid: process.pid,
@@ -305,6 +546,14 @@ export class TspmDaemon {
           processCount: this.tspmInstance.processes.size,
           memoryUsage: memUsage.heapUsed,
           cpuUsage: process.cpuUsage().user / 1000000, // Convert to seconds
+          version: this.version,
+          logsInMemory: {
+            totalCount: totalLogCount,
+            totalBytes: totalLogBytes,
+            perProcess,
+          },
+          paths: pathsInfo,
+          configs: configsInfo,
         };
       },
     );
@@ -497,3 +746,11 @@ export const startDaemon = async (): Promise<void> => {
   // Keep the process alive
   await new Promise(() => {});
 };
+
+// If this file is run directly (not imported), start the daemon
+if (process.env.TSPM_DAEMON_MODE === 'true') {
+  startDaemon().catch((error) => {
+    console.error('Failed to start TSPM daemon:', error);
+    process.exit(1);
+  });
+}

ts/plugins.ts

@@ -6,15 +6,17 @@ import * as path from 'node:path';
 export { childProcess, path };
 
 // @push.rocks scope
-import * as npmextra from '@push.rocks/npmextra';
+import * as smartconfig from '@push.rocks/smartconfig';
 import * as projectinfo from '@push.rocks/projectinfo';
 import * as smartcli from '@push.rocks/smartcli';
 import * as smartdaemon from '@push.rocks/smartdaemon';
+import * as smartfs from '@push.rocks/smartfs';
 import * as smartipc from '@push.rocks/smartipc';
 import * as smartpath from '@push.rocks/smartpath';
+import * as smartinteract from '@push.rocks/smartinteract';
 
 // Export with explicit module types
-export { npmextra, projectinfo, smartcli, smartdaemon, smartipc, smartpath };
+export { smartconfig, projectinfo, smartcli, smartdaemon, smartfs, smartipc, smartpath, smartinteract };
 
 // third-party scope
 import psTree from 'ps-tree';

ts/shared/protocol/id.ts

@@ -0,0 +1,56 @@
+/**
+ * Branded type for process IDs to ensure type safety
+ */
+export type ProcessId = number & { readonly __brand: 'ProcessId' };
+
+/**
+ * Input type that accepts various ID formats for backward compatibility
+ */
+export type ProcessIdInput = ProcessId | number | string;
+
+/**
+ * Normalizes various ID input formats to a ProcessId
+ * @param input - The ID in various formats (string, number, or ProcessId)
+ * @returns A normalized ProcessId
+ * @throws Error if the input is not a valid process ID
+ */
+export function toProcessId(input: ProcessIdInput): ProcessId {
+  let num: number;
+  
+  if (typeof input === 'string') {
+    const trimmed = input.trim();
+    if (!/^\d+$/.test(trimmed)) {
+      throw new Error(`Invalid process ID: "${input}" is not a numeric string`);
+    }
+    num = parseInt(trimmed, 10);
+  } else if (typeof input === 'number') {
+    num = input;
+  } else {
+    // Already a ProcessId
+    return input;
+  }
+  
+  if (!Number.isInteger(num) || num < 1) {
+    throw new Error(`Invalid process ID: ${input} must be a positive integer`);
+  }
+  
+  return num as ProcessId;
+}
+
+/**
+ * Type guard to check if a value is a ProcessId
+ */
+export function isProcessId(value: unknown): value is ProcessId {
+  return typeof value === 'number' && Number.isInteger(value) && value >= 1;
+}
+
+/**
+ * Gets the next sequential ID given existing IDs
+ */
+export function getNextProcessId(existingIds: Iterable<ProcessId>): ProcessId {
+  let maxId = 0;
+  for (const id of existingIds) {
+    maxId = Math.max(maxId, id);
+  }
+  return (maxId + 1) as ProcessId;
+}

ts/shared/protocol/ipc.types.ts

@@ -1,3 +1,5 @@
+import type { ProcessId } from './id.js';
+
 // Process-related interfaces (used in IPC communication)
 export interface IMonitorConfig {
   name?: string; // Optional name to identify the instance
@@ -11,14 +13,14 @@ export interface IMonitorConfig {
 }
 
 export interface IProcessConfig extends IMonitorConfig {
-  id: string; // Unique identifier for the process
+  id: ProcessId; // Unique identifier for the process
   autorestart: boolean; // Whether to restart the process automatically on crash
   watch?: boolean; // Whether to watch for file changes and restart
   watchPaths?: string[]; // Paths to watch for changes
 }
 
 export interface IProcessInfo {
-  id: string;
+  id: ProcessId;
   pid?: number;
   status: 'online' | 'stopped' | 'errored';
   memory: number;
@@ -61,14 +63,25 @@ export interface StartRequest {
 }
 
 export interface StartResponse {
-  processId: string;
+  processId: ProcessId;
+  pid?: number;
+  status: 'online' | 'stopped' | 'errored';
+}
+
+// Start by id (server resolves config)
+export interface StartByIdRequest {
+  id: ProcessId;
+}
+
+export interface StartByIdResponse {
+  processId: ProcessId;
   pid?: number;
   status: 'online' | 'stopped' | 'errored';
 }
 
 // Stop command
 export interface StopRequest {
-  id: string;
+  id: ProcessId;
 }
 
 export interface StopResponse {
@@ -78,18 +91,18 @@ export interface StopResponse {
 
 // Restart command
 export interface RestartRequest {
-  id: string;
+  id: ProcessId;
 }
 
 export interface RestartResponse {
-  processId: string;
+  processId: ProcessId;
   pid?: number;
   status: 'online' | 'stopped' | 'errored';
 }
 
 // Delete command
 export interface DeleteRequest {
-  id: string;
+  id: ProcessId;
 }
 
 export interface DeleteResponse {
@@ -108,7 +121,7 @@ export interface ListResponse {
 
 // Describe command
 export interface DescribeRequest {
-  id: string;
+  id: ProcessId;
 }
 
 export interface DescribeResponse {
@@ -118,7 +131,7 @@ export interface DescribeResponse {
 
 // Get logs command
 export interface GetLogsRequest {
-  id: string;
+  id: ProcessId;
   lines?: number;
 }
 
@@ -126,15 +139,38 @@ export interface GetLogsResponse {
   logs: IProcessLog[];
 }
 
+// Subscribe and stream backlog logs
+export interface LogsSubscribeRequest {
+  id: ProcessId;
+  lines?: number; // number of backlog lines
+  sinceTime?: number; // ms epoch
+  types?: Array<IProcessLog['type']>;
+}
+
+export interface LogsSubscribeResponse {
+  ok: boolean;
+}
+
+// Inspect current subscribers for a process log topic
+export interface LogsSubscribersRequest {
+  id: ProcessId;
+}
+
+export interface LogsSubscribersResponse {
+  topic: string;
+  subscribers: string[];
+  count: number;
+}
+
 // Start all command
 export interface StartAllRequest {
   // No parameters needed
 }
 
 export interface StartAllResponse {
-  started: string[];
+  started: ProcessId[];
   failed: Array<{
-    id: string;
+    id: ProcessId;
     error: string;
   }>;
 }
@@ -145,9 +181,9 @@ export interface StopAllRequest {
 }
 
 export interface StopAllResponse {
-  stopped: string[];
+  stopped: ProcessId[];
   failed: Array<{
-    id: string;
+    id: ProcessId;
     error: string;
   }>;
 }
@@ -158,9 +194,23 @@ export interface RestartAllRequest {
 }
 
 export interface RestartAllResponse {
-  restarted: string[];
+  restarted: ProcessId[];
   failed: Array<{
-    id: string;
+    id: ProcessId;
+    error: string;
+  }>;
+}
+
+// Reset command (stop all and clear configs)
+export interface ResetRequest {
+  // No parameters needed
+}
+
+export interface ResetResponse {
+  stopped: ProcessId[];
+  removed: ProcessId[];
+  failed: Array<{
+    id: ProcessId;
     error: string;
   }>;
 }
@@ -177,6 +227,21 @@ export interface DaemonStatusResponse {
   processCount: number;
   memoryUsage?: number;
   cpuUsage?: number;
+  version?: string;
+  // Additional metadata (optional)
+  paths?: {
+    tspmDir?: string;
+    socketPath?: string;
+    pidFile?: string;
+  };
+  configs?: {
+    processConfigs?: number;
+  };
+  logsInMemory?: {
+    totalCount: number;
+    totalBytes: number;
+    perProcess: Array<{ id: ProcessId; count: number; bytes: number }>;
+  };
 }
 
 // Daemon shutdown command
@@ -203,38 +268,55 @@ export interface HeartbeatResponse {
 // Add (register config without starting)
 export interface AddRequest {
   // Optional id is ignored server-side if present; server assigns sequential id
-  config: Omit<IProcessConfig, 'id'> & { id?: string };
+  config: Omit<IProcessConfig, 'id'> & { id?: ProcessId };
 }
 
 export interface AddResponse {
-  id: string;
+  id: ProcessId;
   config: IProcessConfig;
 }
 
 // Remove (delete config and stop if running)
-export interface RemoveRequest {
-  id: string;
+
+// Update (modify existing config)
+export interface UpdateRequest {
+  id: ProcessId;
+  updates: Partial<Omit<IProcessConfig, 'id'>>;
 }
 
-export interface RemoveResponse {
-  success: boolean;
-  message?: string;
+export interface UpdateResponse {
+  id: ProcessId;
+  config: IProcessConfig;
+}
+
+// Resolve a user-provided target (id:n or name:foo or numeric string) to a ProcessId
+export interface ResolveTargetRequest {
+  target: string;
+}
+
+export interface ResolveTargetResponse {
+  id: ProcessId;
+  name?: string;
 }
 
 // Type mappings for methods
 export type IpcMethodMap = {
   start: { request: StartRequest; response: StartResponse };
+  startById: { request: StartByIdRequest; response: StartByIdResponse };
   stop: { request: StopRequest; response: StopResponse };
   restart: { request: RestartRequest; response: RestartResponse };
   delete: { request: DeleteRequest; response: DeleteResponse };
   add: { request: AddRequest; response: AddResponse };
-  remove: { request: RemoveRequest; response: RemoveResponse };
+  update: { request: UpdateRequest; response: UpdateResponse };
   list: { request: ListRequest; response: ListResponse };
   describe: { request: DescribeRequest; response: DescribeResponse };
   getLogs: { request: GetLogsRequest; response: GetLogsResponse };
+  'logs:subscribe': { request: LogsSubscribeRequest; response: LogsSubscribeResponse };
+  'logs:subscribers': { request: LogsSubscribersRequest; response: LogsSubscribersResponse };
   startAll: { request: StartAllRequest; response: StartAllResponse };
   stopAll: { request: StopAllRequest; response: StopAllResponse };
   restartAll: { request: RestartAllRequest; response: RestartAllResponse };
+  reset: { request: ResetRequest; response: ResetResponse };
   'daemon:status': {
     request: DaemonStatusRequest;
     response: DaemonStatusResponse;
@@ -244,6 +326,7 @@ export type IpcMethodMap = {
     response: DaemonShutdownResponse;
   };
   heartbeat: { request: HeartbeatRequest; response: HeartbeatResponse };
+  resolveTarget: { request: ResolveTargetRequest; response: ResolveTargetResponse };
 };
 
 // Helper type to extract request type for a method