@goodandready/dsh-cron 0.3.20 → 0.3.21

package/README.md

@@ -96,8 +96,9 @@ graph TD
 - **Automated Synthesis**: Aggregates worker outputs into a structured Markdown digest or delegates synthesis to a designated synthesizer model.
 - **Swarm Metrics & History**: Run history records total, succeeded, failed counts, and duration alongside detailed per-worker execution logs.
 
-### 🔍 Git Diff & Interactive Patch Review (#351)
-- **Automatic Diff Capture**: Tasks running in Git worktrees capture modified files, stat summary, and unified diffs (up to 256 KiB) automatically.
+### 🔍 Git Diff & Interactive Patch Review (#351, #379)
+- **Scoped Diff Capture**: Tasks running in Git worktrees capture modified files, stat summary, and unified diffs (up to 256 KiB) automatically. Non-worktree tasks ignore repository diffs by default, avoiding storage bloat, but can opt in explicitly via `captureGitDiff: true`.
+- **Lightweight Archive Storage**: Historical run archives automatically strip heavy raw diff payloads into concise excerpts with byte-budget caps (max 15MB) and automatic cleanup of orphaned `.tmp.*` files.
 - **1-Click Discard**: Revert uncommitted working directory changes safely with a single click (`git reset --hard HEAD && git clean -fd`).
 - **1-Click Apply**: Re-apply previously captured diffs directly to the repository (`git apply --whitespace=fix`).
 - **Interactive Run Preview**: Color-coded diff inspector embedded directly into the execution history drawer.
@@ -215,7 +216,7 @@ Every task picks its own runtime; non-LLM runtimes need no model and consume no
 
 ### 8. Session Integration & Permissions
 * **Real Assistant Output & Terminal Status Extraction** — Isolates current turn session events, extracts the actual assistant message text (excluding previous turn history in persistent sessions), and validates terminal turn status (`turn/end` errors or interruptions) to guarantee accurate reporting, chaining, and structured action execution.
-* **Per-task permission presets** — `default`, `read-only`, `workspace-write`, or `full` are applied to the task's agent session before the prompt runs.
+* **Per-task permission presets & unattended approval** — `default`, `read-only`, `workspace-write`, or `danger-full-access` (aliased as `full`) are mapped directly to host `SandboxMode` and applied to the task's agent session before the prompt runs. For unattended background runs, approval policy is pinned to `never` via host `approval` service to eliminate interactive approval stalls.
 * **Session auto-archive** — isolated cron sessions are archived after each run (best-effort) so they do not clutter the chat list.
 * **History → session navigation** — every LLM run records its session; open it straight from the run history entry.
 

package/lib/api-collection.js

@@ -169,7 +169,7 @@ export function buildTaskRecord(store, body, taskType, parsed) {
     misfirePolicy: ['skip', 'runOnce', 'catchUpAll'].includes(body.misfirePolicy) ? body.misfirePolicy : (current ? (current.misfirePolicy || 'skip') : 'skip'),
     maxRetries: body.maxRetries !== undefined ? Math.max(0, Number(body.maxRetries) || 0) : (current ? (Number(current.maxRetries) || 0) : 0),
     retryBackoffMs: body.retryBackoffMs !== undefined ? Math.max(1000, Number(body.retryBackoffMs) || 30000) : (current ? (Number(current.retryBackoffMs) || 30000) : 30000),
-    permissionPreset: !EXTERNAL_RUNTIMES.includes(taskType) && ['default', 'read-only', 'workspace-write', 'full'].includes(body.permissionPreset) ? body.permissionPreset : (current && !EXTERNAL_RUNTIMES.includes(taskType) ? (current.permissionPreset || 'default') : 'default'),
+    permissionPreset: !EXTERNAL_RUNTIMES.includes(taskType) && ['default', 'read-only', 'workspace-write', 'danger-full-access', 'full'].includes(body.permissionPreset) ? body.permissionPreset : (current && !EXTERNAL_RUNTIMES.includes(taskType) ? (current.permissionPreset || 'default') : 'default'),
     validators: Array.isArray(body.validators) ? sanitizeValidators(body.validators) : (current ? current.validators : undefined),
     ...mergeExecutionFields(current, body, parsed),
   };
@@ -194,6 +194,7 @@ export function mergeExecutionFields(current, body, parsed) {
     workspaceId: body.workspaceId !== undefined ? String(body.workspaceId).trim() : (current ? current.workspaceId : ''),
     worktree: body.worktree !== undefined ? Boolean(body.worktree) : (current ? Boolean(current.worktree) : false),
     keepWorktree: body.keepWorktree !== undefined ? Boolean(body.keepWorktree) : (current ? Boolean(current.keepWorktree) : false),
+    captureGitDiff: body.captureGitDiff !== undefined ? Boolean(body.captureGitDiff) : (body.captureDiff !== undefined ? Boolean(body.captureDiff) : (current ? current.captureGitDiff : undefined)),
     httpMethod: body.httpMethod ? String(body.httpMethod).toUpperCase() : (current ? current.httpMethod : 'GET'),
     httpUrl: body.httpUrl !== undefined ? String(body.httpUrl).trim() : (current ? current.httpUrl : ''),
     httpHeaders: body.httpHeaders !== undefined ? body.httpHeaders : (current ? current.httpHeaders : undefined),

package/lib/client.js

@@ -1441,6 +1441,7 @@ const [formCwd, setFormCwd] = React.useState('');
 const [formWorkspaceId, setFormWorkspaceId] = React.useState('');
 const [formWorktree, setFormWorktree] = React.useState(false);
 const [formKeepWorktree, setFormKeepWorktree] = React.useState(false);
+const [formCaptureGitDiff, setFormCaptureGitDiff] = React.useState(false);
 const [formHttpMethod, setFormHttpMethod] = React.useState('GET');
 const [formHttpUrl, setFormHttpUrl] = React.useState('');
 const [formHttpHeaders, setFormHttpHeaders] = React.useState('');
@@ -1496,6 +1497,7 @@ cwd: String(formCwd || '').trim(),
 workspaceId: String(formWorkspaceId || '').trim(),
 worktree: Boolean(formWorktree),
 keepWorktree: Boolean(formKeepWorktree),
+captureGitDiff: Boolean(formCaptureGitDiff),
 httpMethod: String(formHttpMethod || 'GET'),
 httpUrl: String(formHttpUrl || '').trim(),
 httpHttpHeaders: String(formHttpHeaders || '').trim(),
@@ -2130,6 +2132,7 @@ setFormCwd('');
 setFormWorkspaceId('');
 setFormWorktree(false);
 setFormKeepWorktree(false);
+setFormCaptureGitDiff(false);
 setFormHttpMethod('GET');
 setFormHttpUrl('');
 setFormHttpHeaders('');
@@ -2217,6 +2220,7 @@ cwd: '',
 workspaceId: '',
 worktree: false,
 keepWorktree: false,
+captureGitDiff: false,
 httpMethod: 'GET',
 httpUrl: '',
 httpHttpHeaders: '',
@@ -2342,7 +2346,7 @@ setSchedulePreviewRuns(null);
 setFormTimezone(task.timezone || '');
 setFormMisfirePolicy(task.misfirePolicy || 'skip');
 setFormMaxRetries(task.maxRetries !== undefined ? task.maxRetries : 0);
-setFormPermissionPreset(task.permissionPreset || 'default');
+setFormPermissionPreset(task.permissionPreset === 'full' ? 'danger-full-access' : (task.permissionPreset || 'default'));
 setFormAgentPreset(task.agentPreset || '');
 setFormSessionTitle(task.sessionTitle || '');
 setFormTargetSessionId(task.targetSessionId || '');
@@ -2352,6 +2356,7 @@ setFormCwd(task.cwd || '');
 setFormWorkspaceId(task.workspaceId || '');
 setFormWorktree(Boolean(task.worktree));
 setFormKeepWorktree(Boolean(task.keepWorktree));
+setFormCaptureGitDiff(task.captureGitDiff !== undefined ? Boolean(task.captureGitDiff) : Boolean(task.worktree));
 setFormHttpMethod(task.httpMethod || 'GET');
 setFormHttpUrl(task.httpUrl || '');
 setFormHttpHeaders(typeof task.httpHeaders === 'string' ? task.httpHeaders : (task.httpHeaders ? JSON.stringify(task.httpHeaders) : ''));
@@ -2426,6 +2431,7 @@ cwd: formCwd.trim(),
 workspaceId: formWorkspaceId.trim(),
 worktree: isAgentType ? Boolean(formWorktree) : false,
 keepWorktree: isAgentType ? Boolean(formKeepWorktree) : false,
+captureGitDiff: Boolean(formCaptureGitDiff),
 httpMethod: formHttpMethod,
 httpUrl: formHttpUrl.trim(),
 httpHeaders: formHttpHeaders.trim() || undefined,
@@ -3423,7 +3429,7 @@ onChange: (e) => setFormPermissionPreset(e.target.value)
 _h('option', { value: 'default' }, T_KEY(t, 'form.permissionDefault')),
 _h('option', { value: 'read-only' }, T_KEY(t, 'form.permissionReadonly')),
 _h('option', { value: 'workspace-write' }, T_KEY(t, 'form.permissionWrite')),
-_h('option', { value: 'full' }, T_KEY(t, 'form.permissionFull'))
+_h('option', { value: 'danger-full-access' }, T_KEY(t, 'form.permissionFull'))
 )
 )
 )
@@ -3683,6 +3689,14 @@ checked: formKeepWorktree,
 onChange: (e) => setFormKeepWorktree(e.target.checked)
 }),
 _h('span', null, T_KEY(t, 'form.keepWorktreeLabel'))
+),
+_h('label', { className: 'dsh-cron-checkbox-row', style: { marginLeft: formWorktree ? '24px' : '0px', marginTop: '6px' } },
+_h('input', {
+type: 'checkbox',
+checked: formCaptureGitDiff,
+onChange: (e) => setFormCaptureGitDiff(e.target.checked)
+}),
+_h('span', null, T_KEY(t, 'form.captureGitDiffLabel'))
 )
 ),
 formType !== 'http' && _h('div', { className: 'dsh-cron-form-group' },

package/lib/cron-tool.js

@@ -149,9 +149,13 @@ export const cronToolParameters = {
   },
   permissionPreset: {
     type: 'string',
-    enum: ['default', 'read-only', 'workspace-write', 'full'],
+    enum: ['default', 'read-only', 'workspace-write', 'danger-full-access', 'full'],
     description: 'Permission preset applied to the task session (only used for agent session tasks: llm, skill, workflow)',
   },
+  captureGitDiff: {
+    type: 'boolean',
+    description: 'Whether to capture git diff on run completion. Defaults to true for worktree tasks and false for non-worktree tasks.',
+  },
   sessionTitle: {
     type: 'string',
     description: 'Custom session title template for isolated agent runs (supports {{date}} placeholder, e.g. "{{date}} [Daily] Report")',

package/lib/locales.json

@@ -179,6 +179,7 @@
     "form.permissionDefault": "默认 (继承主配置)",
     "form.permissionRestricted": "受限模式 (只读)",
     "form.permissionFull": "完全访问权限",
+    "form.captureGitDiffLabel": "捕获 Git Diff (任务结束时记录代码变更)",
     "form.envLabel": "环境变量 (KEY=VALUE, 每行一个)",
     "form.envPlaceholder": "FOO=bar\\nAPI_KEY=secret",
     "form.cwdLabel": "工作目录 (绝对路径)",

package/lib/runner.js

@@ -644,16 +644,37 @@ export class SessionRunner {
     }
   }
 
-  /** Per-job permission preset (#32): read-only | workspace-write | full. */
+  /** Per-job permission preset (#32, #380, GH #18): read-only | workspace-write | danger-full-access (or full alias). */
   _applyPermissionPreset(task, handle) {
-    if (!task.permissionPreset || task.permissionPreset === 'default') return;
+    if (!task.permissionPreset || task.permissionPreset === 'default') {
+      this._pinApprovalPolicy(handle);
+      return;
+    }
+    const targetPreset = task.permissionPreset === 'full' ? 'danger-full-access' : task.permissionPreset;
     try {
-      const presets = this.ctx.get && this.ctx.get('permissionPresets');
+      const presets = this.ctx.get ? this.ctx.get('permissionPresets') : this.ctx.permissionPresets;
       if (presets && typeof presets.set === 'function') {
-        presets.set(handle.agent.session, task.permissionPreset);
+        presets.set(handle.agent.session, targetPreset);
       }
     } catch (ppErr) {
-      logger.warn('[dsh-cron] permission preset not applied:', ppErr.message);
+      logger.warn(`[dsh-cron] permission preset "${task.permissionPreset}" (target: "${targetPreset}") not applied to task ${task.id || ''}:`, ppErr.message);
+    }
+    this._pinApprovalPolicy(handle);
+  }
+
+  _pinApprovalPolicy(handle) {
+    try {
+      const approval = this.ctx.get ? this.ctx.get('approval') : this.ctx.approval;
+      if (approval && typeof approval.setPolicy === 'function') {
+        if (handle?.agent) {
+          bestEffort('approval-set-policy-agent', () => approval.setPolicy(handle.agent, 'never'), logger);
+        }
+        if (handle?.agent?.session) {
+          bestEffort('approval-set-policy-session', () => approval.setPolicy(handle.agent.session, 'never'), logger);
+        }
+      }
+    } catch (appErr) {
+      logger.warn('[dsh-cron] approval setPolicy not applied:', appErr.message);
     }
   }
 

package/lib/scheduler-completion.js

@@ -142,16 +142,20 @@ export async function handleCompleteRun(scheduler, task, taskId, currentRun, out
     runInfo.swarmStats = outcome.swarmStats;
   }
 
-  // Capture git diff if task runs in a worktree or custom git cwd (#351)
-  const diffDir = task.worktree ? (runInfo.worktreePath || task.cwd) : task.cwd;
+  // Capture git diff if task runs in a worktree or explicitly opted in (#351, #379, GH #17)
+  const explicitCapture = (typeof task.captureGitDiff === 'boolean')
+    ? task.captureGitDiff
+    : ((typeof task.captureDiff === 'boolean') ? task.captureDiff : null);
+  const shouldCaptureDiff = explicitCapture !== null ? explicitCapture : Boolean(task.worktree);
+  const diffDir = shouldCaptureDiff ? (task.worktree ? (runInfo.worktreePath || task.cwd) : task.cwd) : null;
   if (diffDir) {
     try {
       const diffResult = await captureGitDiff(diffDir);
       if (diffResult && diffResult.hasChanges) {
         runInfo.gitDiff = diffResult;
       }
-    } catch {
-      // Non-fatal if diff capture fails
+    } catch (diffErr) {
+      bestEffort('log-diff-error', () => scheduler?.logger?.debug?.(`[dsh-cron] git diff capture failed: ${diffErr?.message}`));
     }
   }
 

package/lib/store.js

@@ -60,6 +60,7 @@ export class TaskStore {
       fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
     }
     bestEffort('chmod-dir', () => fs.chmodSync(dir, 0o700));
+    this._cleanOrphanedTmpFiles(dir);
     const bakPath = `${this.filePath}.bak`;
 
     const loadData = (raw) => {
@@ -823,6 +824,17 @@ export class TaskStore {
       },
       ...prevRuns,
     ];
+    // Truncate raw diff in older active history entries to bound memory and JSON size (#379, GH #17)
+    for (let i = 10; i < runs.length; i++) {
+      const r = runs[i];
+      if (r && r.gitDiff && r.gitDiff.diff && r.gitDiff.diff.length > 2000) {
+        r.gitDiff = {
+          ...r.gitDiff,
+          diff: r.gitDiff.diff.slice(0, 2000) + '\n... [diff truncated in history]',
+          truncated: true,
+        };
+      }
+    }
     // Keep up to 100 runs in active store; archive older runs to tasks-history-archive.json (#134)
     if (runs.length > 100) {
       const overflow = runs.splice(100);
@@ -833,7 +845,32 @@ export class TaskStore {
   }
 
   /**
-   * Append rotated overflow history entries into tasks-history-archive.json (#134).
+   * Remove orphaned temporary write files older than 10 minutes (#379, GH #17).
+   */
+  _cleanOrphanedTmpFiles(dir) {
+    try {
+      if (!fs.existsSync(dir)) return;
+      const entries = fs.readdirSync(dir);
+      const now = Date.now();
+      const tenMinutesMs = 10 * 60 * 1000;
+      for (const entry of entries) {
+        if (entry.includes('.tmp.')) {
+          const fullPath = path.join(dir, entry);
+          bestEffort('clean-tmp-file', () => {
+            const stat = fs.statSync(fullPath);
+            if (stat.isFile() && (now - stat.mtimeMs > tenMinutesMs)) {
+              fs.unlinkSync(fullPath);
+            }
+          });
+        }
+      }
+    } catch (dirErr) {
+      bestEffort('log-clean-tmp-dir-error', () => logger.debug?.(`[dsh-cron] clean orphaned tmp dir error: ${dirErr?.message}`));
+    }
+  }
+
+  /**
+   * Append rotated overflow history entries into tasks-history-archive.json (#134, #379, GH #17).
    */
   _archiveHistoryRuns(id, overflowRuns) {
     if (!Array.isArray(overflowRuns) || overflowRuns.length === 0) return;
@@ -845,14 +882,43 @@ export class TaskStore {
         archive = bestEffort('parse-history-archive', () => JSON.parse(fs.readFileSync(archivePath, 'utf-8'))) || {};
       }
       if (!Array.isArray(archive[id])) archive[id] = [];
-      archive[id].push(...overflowRuns);
+
+      // Strip full raw diff payload from archived overflow runs to prevent runaway JSON growth (#379, GH #17)
+      const sanitizedOverflow = overflowRuns.map((r) => {
+        if (!r || !r.gitDiff) return r;
+        const { diff, ...gitDiffMeta } = r.gitDiff;
+        return {
+          ...r,
+          gitDiff: {
+            ...gitDiffMeta,
+            diffExcerpt: diff ? diff.slice(0, 500) : '',
+            hasChanges: Boolean(gitDiffMeta.hasChanges),
+            archived: true,
+          },
+        };
+      });
+
+      archive[id].push(...sanitizedOverflow);
       if (archive[id].length > 1000) {
         archive[id] = archive[id].slice(-1000);
       }
+
+      // Enforce total archive size budget (max 15MB) across tasks (#379, GH #17)
+      const MAX_ARCHIVE_BYTES = 15 * 1024 * 1024;
+      let serialized = JSON.stringify(archive);
+      if (serialized.length > MAX_ARCHIVE_BYTES) {
+        for (const taskId of Object.keys(archive)) {
+          if (Array.isArray(archive[taskId]) && archive[taskId].length > 100) {
+            archive[taskId] = archive[taskId].slice(-100);
+          }
+        }
+        serialized = JSON.stringify(archive);
+      }
+
       // Write atomically with tmp file using compact JSON (avoiding mega-lines and null, 2 serialization bloat)
       const rand = Math.random().toString(36).slice(2, 8);
       const tmp = `${archivePath}.tmp.${process.pid}_${Date.now()}_${rand}`;
-      fs.writeFileSync(tmp, JSON.stringify(archive), { encoding: 'utf-8', mode: 0o600 });
+      fs.writeFileSync(tmp, serialized, { encoding: 'utf-8', mode: 0o600 });
       bestEffort('chmod-tmp', () => fs.chmodSync(tmp, 0o600));
       fs.renameSync(tmp, archivePath);
       bestEffort('chmod-archive', () => fs.chmodSync(archivePath, 0o600));

package/lib/task-create.js

@@ -85,7 +85,8 @@ export function executeCreateTask(store, scheduler, args) {
     misfirePolicy: ['skip', 'runOnce', 'catchUpAll'].includes(args.misfirePolicy) ? args.misfirePolicy : 'skip',
     maxRetries: Number(args.maxRetries) > 0 ? Number(args.maxRetries) : 0,
     retryBackoffMs: Number(args.retryBackoffMs) > 0 ? Number(args.retryBackoffMs) : 30000,
-    permissionPreset: !EXTERNAL_RUNTIMES.includes(taskType) && ['default', 'read-only', 'workspace-write', 'full'].includes(args.permissionPreset) ? args.permissionPreset : 'default',
+    permissionPreset: !EXTERNAL_RUNTIMES.includes(taskType) && ['default', 'read-only', 'workspace-write', 'danger-full-access', 'full'].includes(args.permissionPreset) ? args.permissionPreset : 'default',
+    captureGitDiff: typeof args.captureGitDiff === 'boolean' ? args.captureGitDiff : (typeof args.captureDiff === 'boolean' ? args.captureDiff : undefined),
     kanbanMode: args.kanbanMode || 'none',
     channels: Array.isArray(args.channels) ? args.channels.filter((c) => CHANNEL_IDS.includes(c)) : undefined,
     template: args.template ? String(args.template) : '',

package/lib/task-patch.js

@@ -156,6 +156,16 @@ export function buildTaskPatch(current, body) {
   if (patch.tokenLimit !== undefined) {
     patch.tokenLimit = patch.tokenLimit === null ? null : (Number(patch.tokenLimit) > 0 ? Number(patch.tokenLimit) : null);
   }
+  if (patch.permissionPreset !== undefined) {
+    patch.permissionPreset = ['default', 'read-only', 'workspace-write', 'danger-full-access', 'full'].includes(patch.permissionPreset)
+      ? patch.permissionPreset
+      : 'default';
+  }
+  if (patch.captureGitDiff !== undefined) {
+    patch.captureGitDiff = Boolean(patch.captureGitDiff);
+  } else if (patch.captureDiff !== undefined) {
+    patch.captureGitDiff = Boolean(patch.captureDiff);
+  }
   const effectiveType = patch.type !== undefined ? normalizeTaskType(patch.type) : current.type;
   if (EXTERNAL_RUNTIMES.includes(effectiveType) && patch.permissionPreset !== undefined) {
     patch.permissionPreset = 'default';

package/lib/task-transfer.js

@@ -44,6 +44,7 @@ export const PATCHABLE_TASK_FIELDS = [
   'workspaceId',
   'worktree',
   'keepWorktree',
+  'captureGitDiff',
   'httpMethod',
   'httpUrl',
   'httpHeaders',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cron",
-  "version": "0.3.20",
+  "version": "0.3.21",
   "description": "Background automation runner for DSH: isolated agent runs, script/HTTP/SSH/Docker runtimes, cost guard, notifications, heartbeats.",
   "type": "module",
   "main": "lib/index.js",