@goodandready/dsh-goal 0.2.18 → 0.2.20

package/lib/engine-git-branch.js

@@ -1,4 +1,45 @@
 import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import { getSafeCwd } from './goal-engine-constants.js';
+
+/**
+ * Check if directory is inside a valid git repository
+ * @param {string} workspaceRoot
+ * @returns {boolean}
+ */
+export function isGitRepository(workspaceRoot) {
+  if (!workspaceRoot || typeof workspaceRoot !== 'string') return false;
+  try {
+    const safePath = getSafeCwd(workspaceRoot);
+    if (!fs.existsSync(safePath)) return false;
+    execFileSync('git', ['rev-parse', '--is-inside-work-tree'], {
+      cwd: safePath,
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 2000,
+    });
+    return true;
+  } catch (err) {
+    return false;
+  }
+}
+
+/**
+ * Validate that a git ref name is safe to pass to git commands
+ * Prevents flag injection (-*), path traversal, and illegal ref characters
+ * @param {string} ref
+ * @returns {boolean}
+ */
+export function isValidGitRef(ref) {
+  if (!ref || typeof ref !== 'string') return false;
+  const trimmed = ref.trim();
+  if (!trimmed || trimmed.startsWith('-') || trimmed.endsWith('/') || trimmed.endsWith('.lock')) return false;
+  // Disallow control characters, whitespace, and git-forbidden special characters
+  if (/[\x00-\x20\x7f~^:?*\[\\ ]/.test(trimmed)) return false;
+  // Disallow consecutive dots or slashes, and reflog syntax @{
+  if (/\.\.|\/\/|@\{/.test(trimmed)) return false;
+  // Must match valid git ref character set
+  return /^[a-zA-Z0-9._/-]+$/.test(trimmed);
+}
 
 /**
  * Format a sanitized git branch name from goal title
@@ -21,9 +62,11 @@ export function sanitizeBranchSlug(title) {
  * @returns {string} branch name or 'HEAD'
  */
 export function getCurrentGitBranch(cwd = process.cwd()) {
+  const safeCwd = getSafeCwd(cwd);
+  if (!isGitRepository(safeCwd)) return 'main';
   try {
     return execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
-      cwd,
+      cwd: safeCwd,
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'ignore'],
     }).trim();
@@ -39,10 +82,12 @@ export function getCurrentGitBranch(cwd = process.cwd()) {
  * @returns {boolean} success
  */
 export function createGoalBranch(cwd = process.cwd(), branchName) {
-  if (!branchName) return false;
+  if (!isValidGitRef(branchName)) return false;
+  const safeCwd = getSafeCwd(cwd);
+  if (!isGitRepository(safeCwd)) return false;
   try {
     execFileSync('git', ['checkout', '-b', branchName], {
-      cwd,
+      cwd: safeCwd,
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],
     });
@@ -60,15 +105,17 @@ export function createGoalBranch(cwd = process.cwd(), branchName) {
  * @returns {boolean} success
  */
 export function mergeGoalBranch(cwd = process.cwd(), branchName, targetBranch = 'main') {
-  if (!branchName) return false;
+  if (!isValidGitRef(branchName) || !isValidGitRef(targetBranch)) return false;
+  const safeCwd = getSafeCwd(cwd);
+  if (!isGitRepository(safeCwd)) return false;
   try {
-    execFileSync('git', ['checkout', targetBranch], {
-      cwd,
+    execFileSync('git', ['checkout', '--', targetBranch], {
+      cwd: safeCwd,
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],
     });
-    execFileSync('git', ['merge', '--no-ff', '-m', `chore(goal): merge ${branchName}`, branchName], {
-      cwd,
+    execFileSync('git', ['merge', '--no-ff', '-m', `chore(goal): merge ${branchName}`, '--', branchName], {
+      cwd: safeCwd,
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],
     });
@@ -86,15 +133,17 @@ export function mergeGoalBranch(cwd = process.cwd(), branchName, targetBranch =
  * @returns {boolean} success
  */
 export function discardGoalBranch(cwd = process.cwd(), branchName, targetBranch = 'main') {
-  if (!branchName) return false;
+  if (!isValidGitRef(branchName) || !isValidGitRef(targetBranch)) return false;
+  const safeCwd = getSafeCwd(cwd);
+  if (!isGitRepository(safeCwd)) return false;
   try {
-    execFileSync('git', ['checkout', targetBranch], {
-      cwd,
+    execFileSync('git', ['checkout', '--', targetBranch], {
+      cwd: safeCwd,
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],
     });
-    execFileSync('git', ['branch', '-D', branchName], {
-      cwd,
+    execFileSync('git', ['branch', '-D', '--', branchName], {
+      cwd: safeCwd,
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],
     });

package/lib/engine-issue-sync.js

@@ -74,31 +74,37 @@ export function updateChecklistInMarkdown(markdown, itemText, done) {
  * @returns {{ token?: string, baseUrl: string }}
  */
 export function resolveGiteaAuth(options = {}) {
-  const defaultUrl = options.baseUrl || process.env.GITEA_BASE_URL || 'http://127.0.0.1:3005';
+  const baseUrl = options.baseUrl || process.env.GITEA_BASE_URL || "";
   if (options.token) {
-    return { token: options.token, baseUrl: defaultUrl };
+    return { token: options.token, baseUrl };
   }
   if (process.env.GITEA_TOKEN) {
-    return { token: process.env.GITEA_TOKEN, baseUrl: defaultUrl };
+    return { token: process.env.GITEA_TOKEN, baseUrl };
   }
 
-  const credPath = process.env.DSH_GITEA_CREDENTIALS || '/mnt/external/Project/DEV/.gitea-agent-credentials.json';
-  try {
-    if (fs.existsSync(credPath)) {
-      const raw = fs.readFileSync(credPath, 'utf8');
-      const creds = JSON.parse(raw);
-      const agent = creds?.agents?.['deepseek-harness'] || creds?.agents?.antigravity;
-      if (agent?.token) {
-        return {
-          token: agent.token,
-          baseUrl: options.baseUrl || agent.http_remote_base || defaultUrl,
-        };
+  const credPath = process.env.DSH_GITEA_CREDENTIALS;
+  if (credPath && typeof credPath === "string") {
+    try {
+      if (fs.existsSync(credPath)) {
+        const raw = fs.readFileSync(credPath, "utf8");
+        const creds = JSON.parse(raw);
+        const agentName = process.env.DSH_GITEA_AGENT;
+        const agent = (agentName && creds?.agents?.[agentName])
+          || creds?.agents?.["deepseek-harness"]
+          || creds?.agents?.antigravity
+          || creds;
+        if (agent?.token) {
+          return {
+            token: agent.token,
+            baseUrl: baseUrl || agent.http_remote_base || "",
+          };
+        }
       }
+    } catch (err) {
+      // Non-fatal credential read error
     }
-  } catch (err) {
-    // Non-fatal credential read error
   }
-  return { baseUrl: defaultUrl };
+  return { baseUrl };
 }
 
 /**
@@ -122,9 +128,9 @@ export function resolveRepoInfo(cwd = process.cwd(), options = {}) {
       return { owner: match[1], repo: match[2] };
     }
   } catch (err) {
-    // Fallback to default repository
+    // Fallback to options or empty
   }
-  return { owner: 'goodandready', repo: 'dsh-goal' };
+  return { owner: options.owner || "", repo: options.repo || "" };
 }
 
 /**
@@ -140,11 +146,14 @@ export async function syncMilestoneWithIssue(goal, milestone, options = {}) {
   }
 
   const auth = resolveGiteaAuth(options);
-  if (!auth.token) {
-    return { synced: false, error: 'No Gitea API token available' };
+  if (!auth.token || !auth.baseUrl) {
+    return { synced: false, error: 'No Gitea API token or base URL available' };
   }
 
   const repoInfo = resolveRepoInfo(goal.cwd || process.cwd(), options);
+  if (!repoInfo.owner || !repoInfo.repo) {
+    return { synced: false, error: "No Gitea repository owner or name available" };
+  }
   const issueNum = goal.issueRef.issueNumber;
   const issueApiUrl = `${auth.baseUrl}/api/v1/repos/${repoInfo.owner}/${repoInfo.repo}/issues/${issueNum}`;
 

package/lib/engine-reports.js

@@ -206,14 +206,14 @@ export function createMilestoneCheckpoint(milestone, sessionId = 'default', cwd)
     }).trim();
 
     if (status) {
-      execFileSync('git', ['add', '-A'], {
+      execFileSync('git', ['add', '-u'], {
         stdio: ['ignore', 'ignore', 'ignore'],
         timeout: 3000,
         cwd: cwd || undefined,
       });
       const cleanTitle = (milestone.title || '').replace(/[\"\`\$]/g, '');
       const msg = `checkpoint(goal): [${milestone.id}] ${cleanTitle}`;
-      execFileSync('git', ['commit', '-m', msg, '--no-verify'], {
+      execFileSync('git', ['commit', '-m', msg], {
         stdio: ['ignore', 'ignore', 'ignore'],
         timeout: 5000,
         cwd: cwd || undefined,

package/lib/git-snapshot-manager.js

@@ -21,7 +21,7 @@ export class GitSnapshotManager {
         timeout: 2000,
       });
       return true;
-    } catch {
+    } catch (err) {
       return false;
     }
   }

package/lib/goal-engine-constants.js

@@ -1,3 +1,5 @@
+import fs from "node:fs";
+import path from "node:path";
 /**
  * Enums and helpers for DSH Goal Engine
  */
@@ -244,3 +246,47 @@ export function buildSnapshot(goal, sid, engine) {
     enableVoiceAnnouncements: engine.enableVoiceAnnouncements ?? false,
   };
 }
+
+
+/**
+ * Check if child path is inside parent directory or equal to it
+ * @param {string} parent
+ * @param {string} child
+ * @returns {boolean}
+ */
+export function isPathInsideOrEqual(parent, child) {
+  if (!parent || !child) return false;
+  const rel = path.relative(path.resolve(parent), path.resolve(child));
+  return !rel || (!rel.startsWith("..") && !path.isAbsolute(rel));
+}
+
+/**
+ * Validate and confine working directory to ensure it exists and is allowed
+ * @param {string} requestedCwd
+ * @param {string[]} [allowedRoots=[]]
+ * @returns {string} resolved safe cwd
+ */
+export function getSafeCwd(requestedCwd, allowedRoots = []) {
+  const defaultRoot = allowedRoots[0] || process.cwd();
+  if (!requestedCwd || typeof requestedCwd !== "string" || !requestedCwd.trim()) {
+    return defaultRoot;
+  }
+
+  try {
+    const resolved = path.resolve(requestedCwd.trim());
+    const st = fs.statSync(resolved);
+    if (!st.isDirectory()) {
+      return null;
+    }
+
+    const roots = allowedRoots.length > 0 ? allowedRoots : [process.cwd()];
+    const isAllowed = roots.some((root) => isPathInsideOrEqual(root, resolved));
+    if (!isAllowed) {
+      return null;
+    }
+
+    return resolved;
+  } catch (err) {
+    return null;
+  }
+}

package/lib/goal-engine.js

@@ -1,4 +1,4 @@
-import { GoalState, MilestoneStatus, formatElapsed, formatETA, detectLanguage, sessionIdOf, calculateElapsedSeconds, calculateRemainingSeconds, buildSnapshot } from './goal-engine-constants.js';
+import { GoalState, MilestoneStatus, formatElapsed, formatETA, detectLanguage, sessionIdOf, calculateElapsedSeconds, calculateRemainingSeconds, buildSnapshot, getSafeCwd } from './goal-engine-constants.js';
 import { getGitCurrentCommit, exportReportMarkdown, exportReportGitHubPR, createMilestoneCheckpoint, rollbackToCheckpoint, saveGoalArtifact } from './engine-reports.js';
 import { EngineStore } from './engine-store.js';
 import { buildStatePromptInjection } from './engine-prompt.js';
@@ -193,7 +193,7 @@ export class GoalEngine {
       title: cleanTitle,
       description: options.description?.trim() || '',
       lang: options.lang || detectLanguage(cleanTitle),
-      cwd: options.cwd ? String(options.cwd).trim() : null,
+      cwd: options.cwd ? getSafeCwd(options.cwd) : null,
       state: GoalState.RUNNING,
       startedAt: now,
       pausedAt: null,
@@ -227,8 +227,9 @@ export class GoalEngine {
 
     if (this.autoBranchOnGoalStart && options.autoBranch !== false && this.storagePath !== null && process.env.NODE_ENV !== 'test') {
       const slug = sanitizeBranchSlug(cleanTitle);
-      const parentBranch = getCurrentGitBranch(options.cwd);
-      if (createGoalBranch(options.cwd, slug)) {
+      const targetCwd = goal.cwd || process.cwd();
+      const parentBranch = getCurrentGitBranch(targetCwd);
+      if (createGoalBranch(targetCwd, slug)) {
         goal.gitBranch = slug;
         goal.gitParentBranch = parentBranch;
       }

package/lib/index.js

@@ -74,7 +74,7 @@ export function safeService(ctx, name) {
       return ctx.reflect.get(name, false) || null;
     }
     return ctx[name] || null;
-  } catch {
+  } catch (err) {
     return null;
   }
 }

package/lib/routes.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { MilestoneStatus, detectLanguage, sessionIdOf } from './goal-engine-constants.js';
+import { MilestoneStatus, detectLanguage, sessionIdOf, isPathInsideOrEqual, getSafeCwd } from './goal-engine-constants.js';
+import { isValidGitRef } from './engine-git-branch.js';
 import { saveGoalArtifact, rollbackToCheckpoint } from './engine-reports.js';
 import { getTemplatesCatalogue, instantiateTemplate } from './engine-templates.js';
 import { parseIssueChecklist } from './engine-issue-sync.js';
@@ -19,31 +20,42 @@ export function isLoopback(value) {
 
 export function isTrustedCaller(req) {
   if (!req) return false;
-  const remote = req.socket?.remoteAddress || req.connection?.remoteAddress || '';
-  if (isLoopback(remote)) return true;
-
-  const host = String(req.headers?.host || '').toLowerCase();
-  const origin = String(req.headers?.origin || '').trim().toLowerCase();
-  if (origin) {
-    try {
-      const u = new URL(origin);
-      if (u.host === host) return true;
-    } catch (err) { /* invalid url */ }
+  const remote = req.socket?.remoteAddress || req.connection?.remoteAddress || "";
+  const site = req.headers?.["sec-fetch-site"];
+
+  // 1. Cross-site and same-site browser requests are rejected
+  if (site === "cross-site" || site === "same-site") return false;
+
+  // 2. Same-origin browser UI requests (operator UI on LAN or localhost)
+  if (site === "same-origin") {
+    const host = String(req.headers?.host || "").toLowerCase();
+    const origin = String(req.headers?.origin || "").trim().toLowerCase();
+    if (origin && host) {
+      try {
+        const u = new URL(origin);
+        if (u.host === host) return true;
+      } catch (err) {
+        return false;
+      }
+    }
+    const referer = String(req.headers?.referer || "").trim().toLowerCase();
+    if (referer && host) {
+      try {
+        const u = new URL(referer);
+        if (u.host === host) return true;
+      } catch (err) {
+        return false;
+      }
+    }
     return false;
   }
 
-  const referer = String(req.headers?.referer || '').trim().toLowerCase();
-  if (referer) {
-    try {
-      const u = new URL(referer);
-      if (u.host === host) return true;
-    } catch (err) { /* invalid url */ }
-    return false;
-  }
+  // 3. No declared site: only loopback remote clients (CLI, reverse proxy) are trusted
+  if (isLoopback(remote)) return true;
 
-  // Fallback for tests or local CLI without socket where host header targets loopback
-  if (!remote && host) {
-    const hostName = host.split(':')[0];
+  // 4. Fallback for test harnesses without remote socket where host header explicitly targets loopback
+  if (!remote && req.headers?.host) {
+    const hostName = String(req.headers.host).split(":")[0];
     if (isLoopback(hostName)) {
       return true;
     }
@@ -52,36 +64,7 @@ export function isTrustedCaller(req) {
   return false;
 }
 
-export function isPathInsideOrEqual(parent, child) {
-  if (!parent || !child) return false;
-  const rel = path.relative(path.resolve(parent), path.resolve(child));
-  return !rel || (!rel.startsWith('..') && !path.isAbsolute(rel));
-}
-
-export function getSafeCwd(requestedCwd, allowedRoots = []) {
-  const defaultRoot = allowedRoots[0] || process.cwd();
-  if (!requestedCwd || typeof requestedCwd !== 'string' || !requestedCwd.trim()) {
-    return defaultRoot;
-  }
-
-  try {
-    const resolved = path.resolve(requestedCwd.trim());
-    const st = fs.statSync(resolved);
-    if (!st.isDirectory()) {
-      return null;
-    }
-
-    const roots = allowedRoots.length > 0 ? allowedRoots : [process.cwd()];
-    const isAllowed = roots.some((root) => isPathInsideOrEqual(root, resolved));
-    if (!isAllowed) {
-      return null;
-    }
-
-    return resolved;
-  } catch (err) {
-    return null;
-  }
-}
+export { isPathInsideOrEqual, getSafeCwd };
 
 /**
  * Register webServer HTTP routes and SSE stream for DSH Goal
@@ -583,6 +566,14 @@ export function registerRoutes(ctx, {
                 case 'branch_action': {
                   const op = String(data.operation || data.branchOperation || 'merge').toLowerCase();
                   const targetBranch = String(data.targetBranch || 'main');
+                  if (!isValidGitRef(targetBranch)) {
+                    res.statusCode = 400;
+                    return res.end(JSON.stringify({ error: `Invalid targetBranch ref: "${targetBranch}"` }));
+                  }
+                  if (op !== 'merge' && op !== 'discard') {
+                    res.statusCode = 400;
+                    return res.end(JSON.stringify({ error: `Invalid branch operation: "${op}". Allowed: merge, discard` }));
+                  }
                   if (engine) {
                     if (op === 'merge') {
                       const ok = engine.mergeGoalBranch(targetBranch, sid);

package/lib/tools.js

@@ -1,5 +1,6 @@
 import { MilestoneManager } from './milestone-manager.js';
 import { AddonStore } from './addon-store.js';
+import { getSafeCwd } from './goal-engine-constants.js';
 
 /**
  * Tools module for @goodandready/dsh-goal (Core Addon).
@@ -83,9 +84,10 @@ export function registerTools(ctx, { milestoneManager, goalsService, logger = co
         if (!milestoneId) {
           throw new Error('milestoneId is required for complete action');
         }
-        const completed = await mm.completeMilestone(goalId, milestoneId, {
-          cwd: toolCtx?.session?.cwd || toolCtx?.cwd || process.cwd(),
-        });
+        const rawCwd = toolCtx?.session?.cwd || toolCtx?.cwd || process.cwd();
+        const safeCwd = getSafeCwd(rawCwd);
+        const notes = typeof args.notes === 'string' ? args.notes : '';
+        const completed = await mm.completeMilestone(goalId, milestoneId, notes, safeCwd);
         return { ok: true, goalId, milestoneId, milestone: completed };
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-goal",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "description": "Core Goal Addon (Token Budget, Milestones, Git Snapshots & Retrospective Reports) for DeepSeek Harness",
   "type": "module",
   "main": "./lib/index.js",
@@ -19,7 +19,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node --test test/*.test.mjs"
+    "test": "NODE_ENV=test node --test test/*.test.mjs"
   },
   "keywords": [
     "dsh",