@gobing-ai/spur 0.3.82 → 0.3.83

package/plugins/sp/plugin.json

@@ -1,6 +1,6 @@
 {
     "name": "sp",
-    "version": "0.3.82",
+    "version": "0.3.83",
     "description": "Spur — a local-first harness engineering toolkit that wraps mainstream coding agents with constraint checking, workflow orchestration, and history analytics.",
     "extensions": {
         "pi": ["./hooks/pi/guard-extension.ts"]

package/schemas/spur-config.schema.json

@@ -312,6 +312,11 @@
                     "type": "object",
                     "description": "Release knobs for bump-ver/drop-tags. Defaults: -v separator, publish.yml workflow, chore(release) commit, gh run list limit 5.",
                     "properties": {
+                        "aggregatePackage": {
+                            "type": "string",
+                            "minLength": 1,
+                            "description": "Package whose own release tag is the publish trigger for the aggregate (--all) path, as an unscoped package id (e.g. \"spur\" for @gobing-ai/spur). Default: the package whose full name equals the workspace root manifest name."
+                        },
                         "tagVersionSeparator": {
                             "type": "string",
                             "minLength": 1,

package/spur.js

@@ -39789,6 +39789,7 @@ var init_src = __esm(() => {
   VersionCarrierEntrySchema = exports_external.looseObject({ type: exports_external.string().min(1) });
   BuilderBumpVerConfigSchema = exports_external.object({
     tagVersionSeparator: exports_external.string().min(1).default("-v"),
+    aggregatePackage: exports_external.string().min(1).optional(),
     publishWorkflow: exports_external.string().min(1).default("publish.yml"),
     releaseCommitType: exports_external.string().min(1).default("chore"),
     releaseCommitScope: exports_external.string().min(1).default("release"),
@@ -68068,6 +68069,7 @@ async function applyCliMigrations(adapter, migrations = CLI_MIGRATIONS) {
     const runsStatusDoneSkip = migration.id === "0017_spur_cli_runs_status_completed_to_done" && (!await tableExists(adapter, "runs") || !await columnExists(adapter, "runs", "status"));
     const historyBoardToolStatsColumnsSkip = migration.id === "0031_spur_cli_history_board_tool_stats_columns" && (!await tableExists(adapter, "history_board_tool_stats") || await columnExists(adapter, "history_board_tool_stats", "fresh_input_tokens"));
     const queueJobsActiveIndexSkip = migration.id === "0027_spur_cli_history_refresh_active_unique" && !await tableExists(adapter, "queue_jobs");
+    const schedulerCustomActiveIndexSkip = migration.id === "0047_spur_cli_scheduler_custom_active_unique" && !await tableExists(adapter, "queue_jobs");
     const queueJobsDeadlineLeaseSkip = migration.id === "0041_spur_cli_queue_jobs_deadline_lease_columns" && !await tableExists(adapter, "queue_jobs");
     const inboxRequestKeySkip = migration.id === "0043_spur_cli_inbox_messages_request_key" && !await tableExists(adapter, "inbox_messages");
     const coordinationReceiptColumnsSkip = migration.id === "0044_spur_cli_coordination_runs_receipt_columns" && !await tableExists(adapter, "coordination_runs");
@@ -68076,7 +68078,7 @@ async function applyCliMigrations(adapter, migrations = CLI_MIGRATIONS) {
     const historyRollupWatermarkSkip = migration.id === "0036_spur_cli_history_rollup_watermark" && (await tableExists(adapter, "history_board_rollup_watermark") || !await tableExists(adapter, "history_message") || !await columnExists(adapter, "history_message", "imported_at"));
     const boundedRollupDerivationsSkip = migration.id === "0039_spur_cli_bounded_rollup_derivations" && (!await tableExists(adapter, "history_message") || !await columnExists(adapter, "history_message", "source_file") || !await tableExists(adapter, "history_board_source_daily"));
     const historyModelFallbackIndexSkip = migration.id === "0042_spur_cli_history_model_fallback_index" && (!await tableExists(adapter, "history_message") || !await columnExists(adapter, "history_message", "model"));
-    if (shouldApplySql && !sequenceIndexSkip && !argsRawSkip && !runsStatusDoneSkip && !nameOccurredIndexSkip && !historyBoardQueryIndexesSkip && !historyPerformanceIndexesSkip && !historyToolCallIndexesSkip && !historyBoardCoveringIndexesSkip && !historyBoardToolStatsColumnsSkip && !callIdSkip && !tsNullableSkip && !queueJobsActiveIndexSkip && !queueJobsDeadlineLeaseSkip && !inboxRequestKeySkip && !coordinationReceiptColumnsSkip && !historyToolIdentitySkip && !historyMeasureVectorSkip && !historyRollupWatermarkSkip && !boundedRollupDerivationsSkip && !historyModelFallbackIndexSkip) {
+    if (shouldApplySql && !sequenceIndexSkip && !argsRawSkip && !runsStatusDoneSkip && !nameOccurredIndexSkip && !historyBoardQueryIndexesSkip && !historyPerformanceIndexesSkip && !historyToolCallIndexesSkip && !historyBoardCoveringIndexesSkip && !historyBoardToolStatsColumnsSkip && !callIdSkip && !tsNullableSkip && !queueJobsActiveIndexSkip && !schedulerCustomActiveIndexSkip && !queueJobsDeadlineLeaseSkip && !inboxRequestKeySkip && !coordinationReceiptColumnsSkip && !historyToolIdentitySkip && !historyMeasureVectorSkip && !historyRollupWatermarkSkip && !boundedRollupDerivationsSkip && !historyModelFallbackIndexSkip) {
       for (const statement of splitSqlStatements(migration.sql)) {
         await adapter.exec(statement);
       }
@@ -68189,6 +68191,15 @@ CREATE INDEX IF NOT EXISTS queue_jobs_ready_idx ON queue_jobs (status, next_retr
 -- jobs that legitimately have multiple active rows concurrently, so a global
 -- (type, status) unique index would break them.
 CREATE UNIQUE INDEX IF NOT EXISTS queue_jobs_history_refresh_active_unique ON queue_jobs (type) WHERE type = 'history.refresh' AND status IN ('pending', 'processing');
+
+-- At most one ACTIVE configured-scheduler job per job NAME (task 0863): the tick
+-- reads findActiveSchedulerCustomJob and then inserts, which is not atomic across
+-- spur serve daemons sharing one project DB \u2014 every daemon's cron occurrence used
+-- to insert its own row (3-14 per tick on 2026-09-14/15). The name lives inside the
+-- JSON payload, so this is an expression index \u2014 scoped to scheduler.custom +
+-- active rows exactly like the 0716 history.refresh index, so terminal rows and
+-- other job types (task-action, feature-action, history.refresh) stay unaffected.
+CREATE UNIQUE INDEX IF NOT EXISTS queue_jobs_scheduler_custom_active_unique ON queue_jobs (json_extract(payload, '$.name')) WHERE type = 'scheduler.custom' AND status IN ('pending', 'processing');
 `, SYSTEM_EVENTS_SCHEMA_SQL = `
 CREATE TABLE IF NOT EXISTS system_events (
     id TEXT PRIMARY KEY,
@@ -68630,6 +68641,25 @@ CREATE TABLE IF NOT EXISTS agent_instances (
 CREATE INDEX IF NOT EXISTS idx_agent_instances_role ON agent_instances (role);
 CREATE INDEX IF NOT EXISTS idx_agent_instances_executor ON agent_instances (executor);
 CREATE INDEX IF NOT EXISTS idx_agent_instances_team ON agent_instances (team_id);
+`, SCHEDULER_CUSTOM_ACTIVE_UNIQUE_SCHEMA_SQL = `
+UPDATE queue_jobs
+SET status = 'failed',
+    last_error = 'retired by migration 0047_spur_cli_scheduler_custom_active_unique: superseded duplicate active scheduler.custom job name',
+    processing_at = NULL,
+    updated_at = CAST(strftime('%s', 'now') AS INTEGER) * 1000
+WHERE type = 'scheduler.custom'
+  AND status IN ('pending', 'processing')
+  AND id NOT IN (
+      SELECT id FROM (
+          SELECT id, ROW_NUMBER() OVER (
+              PARTITION BY json_extract(payload, '$.name') ORDER BY created_at ASC, id ASC
+          ) AS rank
+          FROM queue_jobs
+          WHERE type = 'scheduler.custom' AND status IN ('pending', 'processing')
+      ) WHERE rank = 1
+  );
+
+CREATE UNIQUE INDEX IF NOT EXISTS queue_jobs_scheduler_custom_active_unique ON queue_jobs (json_extract(payload, '$.name')) WHERE type = 'scheduler.custom' AND status IN ('pending', 'processing');
 `, HISTORY_REFRESH_ACTIVE_UNIQUE_SCHEMA_SQL = `
 UPDATE queue_jobs
 SET status = 'failed',
@@ -69031,6 +69061,10 @@ ${HISTORY_TASK_SESSION_SCHEMA_SQL}
     {
       id: "0046_spur_cli_project_strategy",
       sql: PROJECT_STRATEGY_SCHEMA_SQL
+    },
+    {
+      id: "0047_spur_cli_scheduler_custom_active_unique",
+      sql: SCHEDULER_CUSTOM_ACTIVE_UNIQUE_SCHEMA_SQL
     }
   ];
 });
@@ -86369,6 +86403,14 @@ var init_job_exclusion_guard = __esm(() => {
 });
 
 // ../../packages/app/src/services/scheduler-custom-job-service.ts
+function isSchedulerCustomActiveConflict(error51) {
+  if (typeof error51 !== "object" || error51 === null)
+    return false;
+  const { code, message } = error51;
+  if (typeof message !== "string" || !message.includes(SCHEDULER_CUSTOM_ACTIVE_INDEX))
+    return false;
+  return code === undefined || String(code).startsWith("SQLITE_CONSTRAINT");
+}
 function resolveSchedulerCustomTimeoutMs(env) {
   return normalizeLegacyTimeoutMs(env.SPUR_SCHEDULER_CUSTOM_TIMEOUT_MS, SCHEDULER_CUSTOM_TIMEOUT_MS);
 }
@@ -86408,7 +86450,8 @@ function validateSchedulerCustomJobPayload(raw) {
 async function handleSchedulerCustomJob(deps, job) {
   const payload = validateSchedulerCustomJobPayload(job.payload);
   if (activeJobs.has(payload.name)) {
-    throw new Error(`scheduler job "${payload.name}" is already running in this process; skipping duplicate execution`);
+    deps.onDuplicate?.(payload.name);
+    return;
   }
   const exclusiveKey = payload.exclusiveKey;
   if (exclusiveKey !== undefined) {
@@ -86444,7 +86487,7 @@ async function handleSchedulerCustomJob(deps, job) {
       releaseExclusiveJob(exclusiveKey, `scheduler job "${payload.name}"`);
   }
 }
-var SCHEDULER_CUSTOM_JOB = "scheduler.custom", SCHEDULER_CUSTOM_TIMEOUT_MS = 600000, SCHEDULER_CUSTOM_MAX_OUTPUT = 1e6, activeJobs;
+var SCHEDULER_CUSTOM_JOB = "scheduler.custom", SCHEDULER_CUSTOM_ACTIVE_INDEX = "queue_jobs_scheduler_custom_active_unique", SCHEDULER_CUSTOM_TIMEOUT_MS = 600000, SCHEDULER_CUSTOM_MAX_OUTPUT = 1e6, activeJobs;
 var init_scheduler_custom_job_service = __esm(() => {
   init_execution_policy();
   init_job_exclusion_guard();
@@ -97940,6 +97983,7 @@ __export(exports_src2, {
   materializeRoster: () => materializeRoster,
   looksLikeOpaqueId: () => looksLikeOpaqueId,
   isSystemEventEnvelopeV2: () => isSystemEventEnvelopeV2,
+  isSchedulerCustomActiveConflict: () => isSchedulerCustomActiveConflict,
   isRecordAuthoredReview: () => isRecordAuthoredReview,
   isPortLive: () => isPortLive,
   isPortAvailable: () => isPortAvailable,
@@ -98054,6 +98098,7 @@ __export(exports_src2, {
   STRATEGIES: () => STRATEGIES,
   SCHEDULER_CUSTOM_TIMEOUT_MS: () => SCHEDULER_CUSTOM_TIMEOUT_MS,
   SCHEDULER_CUSTOM_JOB: () => SCHEDULER_CUSTOM_JOB,
+  SCHEDULER_CUSTOM_ACTIVE_INDEX: () => SCHEDULER_CUSTOM_ACTIVE_INDEX,
   RunStoreService: () => RunStoreService,
   RunStoreNotFoundError: () => RunStoreNotFoundError,
   RunStoreBadCursorError: () => RunStoreBadCursorError,
@@ -106397,6 +106442,11 @@ var spur_config_schema_default = {
           type: "object",
           description: "Release knobs for bump-ver/drop-tags. Defaults: -v separator, publish.yml workflow, chore(release) commit, gh run list limit 5.",
           properties: {
+            aggregatePackage: {
+              type: "string",
+              minLength: 1,
+              description: 'Package whose own release tag is the publish trigger for the aggregate (--all) path, as an unscoped package id (e.g. "spur" for @gobing-ai/spur). Default: the package whose full name equals the workspace root manifest name.'
+            },
             tagVersionSeparator: {
               type: "string",
               minLength: 1,
@@ -108884,6 +108934,19 @@ var SEMVER = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z-.]+)?(?:\+[0-9A-Za-z-.]+)?$/;
 function releaseTag(config4, version3) {
   return `${config4.packageName}${config4.tagVersionSeparator}${version3}`;
 }
+function resolveAggregatePackage(aggregatePackage, packages, rootName) {
+  if (aggregatePackage !== undefined) {
+    const config4 = packages.get(aggregatePackage);
+    if (config4 === undefined) {
+      throw new Error(`unknown builder.bump-ver.aggregatePackage "${aggregatePackage}". Package IDs: ${[...packages.keys()].join(", ")}`);
+    }
+    return config4;
+  }
+  return [...packages.values()].find((c3) => c3.packageName === rootName);
+}
+function resolveAggregateTag(ctx, version3) {
+  return ctx.aggregate === undefined ? `${ctx.rootName}-v${version3}` : releaseTag(ctx.aggregate, version3);
+}
 async function run(repoRoot, cmd) {
   const executor = new NodeProcessExecutor3({ defaultTimeout: 30000, defaultMaxOutput: 512000 });
   const result = await executor.run({
@@ -109005,9 +109068,11 @@ async function releaseContext(repoRoot, bumpVerConfig = resolveBuilderBumpVerCon
       }
     }
   }
-  pinnedNames.add(rootName);
+  const aggregate2 = resolveAggregatePackage(bumpVerConfig.aggregatePackage, packages, rootName);
+  if (aggregate2 !== undefined)
+    pinnedNames.add(aggregate2.packageName);
   const allPackages = [...packages.values()].filter((c3) => pinnedNames.has(c3.packageName));
-  return { repoRoot, rootName, packages, allPackages, versionCarriers };
+  return { repoRoot, rootName, aggregate: aggregate2, packages, allPackages, versionCarriers };
 }
 async function updateWorkspacePins(ctx, pkgName, oldVersion, newVersion, output2) {
   const changed = [];
@@ -109188,7 +109253,7 @@ async function bumpAll(ctx, version3, options, output2) {
   }
   const branch = await assertCleanTreeOnBranch(ctx);
   const configs = ctx.allPackages;
-  const aggregateTag = `${ctx.rootName}-v${version3}`;
+  const aggregateTag = resolveAggregateTag(ctx, version3);
   const existingLocal = new Set((await git2(ctx.repoRoot, ["tag", "-l"])).split(`
 `).filter(Boolean));
   const allTags = [aggregateTag, ...configs.map((c3) => releaseTag(c3, version3))];
@@ -109244,7 +109309,13 @@ async function bumpAll(ctx, version3, options, output2) {
       output2.write(`Tagged (trace): ${tag}`);
     }
   }
-  await git2(ctx.repoRoot, ["tag", "-a", aggregateTag, "-m", `${ctx.rootName} ${version3} \u2014 ${shortNames}`]);
+  await git2(ctx.repoRoot, [
+    "tag",
+    "-a",
+    aggregateTag,
+    "-m",
+    `${ctx.aggregate?.packageName ?? ctx.rootName} ${version3} \u2014 ${shortNames}`
+  ]);
   output2.write(`Tagged (publish): ${aggregateTag}`);
   if (!options.push) {
     output2.write(`
@@ -109288,7 +109359,7 @@ async function dropAll(ctx, version3, options, output2) {
   for (const config4 of ctx.allPackages) {
     await dropTagsFor(ctx, config4, version3, options, output2);
   }
-  const aggregateTag = `${ctx.rootName}-v${version3}`;
+  const aggregateTag = resolveAggregateTag(ctx, version3);
   const localTags = new Set((await git2(ctx.repoRoot, ["tag", "-l"])).split(`
 `).filter(Boolean));
   if (localTags.has(aggregateTag)) {
@@ -109829,7 +109900,7 @@ import { createRequire } from "module";
 var CLI_CONFIG = {
   binaryName: "spur",
   binaryLabel: "spur",
-  binaryVersion: "0.3.82",
+  binaryVersion: "0.3.83",
   configDir: ".spur",
   configFile: ".spur/config.yaml",
   databaseFile: ".spur/spur.db"
@@ -121813,41 +121884,58 @@ function registerSchedulerEntries(scheduler3, ctx, jobs = [], options = {}) {
     const sweepThresholdMs = jobPolicy === null ? null : jobPolicy + resolveKillGraceMs3(env);
     register(schedule, `${SCHEDULER_CUSTOM_JOB}:${job.name}`, async () => {
       const queue = await ctx.jobQueue();
+      const enqueueFresh = () => queue.enqueue(SCHEDULER_CUSTOM_JOB, {
+        name: job.name,
+        command: job.command,
+        ...historyProducerExclusiveKeyFor(job.command) !== undefined && {
+          exclusiveKey: historyProducerExclusiveKeyFor(job.command)
+        }
+      }, { maxRetries: 1 });
+      try {
+        await enqueueFresh();
+        return;
+      } catch (error51) {
+        if (!isSchedulerCustomActiveConflict(error51))
+          throw error51;
+      }
       const db2 = await ctx.getDb();
       const active = await findActiveSchedulerCustomJob(db2, job.name);
-      if (active !== undefined) {
-        const now3 = Date.now();
-        const stale = sweepThresholdMs !== null && active.status === "processing" && now3 - (active.processingAt ?? active.updatedAt) > sweepThresholdMs;
-        if (stale) {
-          const reason = `age-sweep: processing exceeded ${sweepThresholdMs}ms`;
-          const swept = await failStaleSchedulerCustomJob(db2, active.id, now3, reason);
-          if (swept) {
+      const now3 = Date.now();
+      const stale = active !== undefined && sweepThresholdMs !== null && active.status === "processing" && now3 - (active.processingAt ?? active.updatedAt) > sweepThresholdMs;
+      if (active !== undefined && stale && sweepThresholdMs !== null) {
+        const reason = `age-sweep: processing exceeded ${sweepThresholdMs}ms`;
+        const swept = await failStaleSchedulerCustomJob(db2, active.id, now3, reason);
+        if (swept) {
+          ctx.eventBus().emit("scheduler.job.executed", {
+            name: `${SCHEDULER_CUSTOM_JOB}:${job.name}`,
+            durationMs: 0,
+            severity: "info",
+            swept: true,
+            reason
+          });
+          try {
+            await enqueueFresh();
+          } catch (error51) {
+            if (!isSchedulerCustomActiveConflict(error51))
+              throw error51;
             ctx.eventBus().emit("scheduler.job.executed", {
               name: `${SCHEDULER_CUSTOM_JOB}:${job.name}`,
               durationMs: 0,
               severity: "info",
-              swept: true,
-              reason
+              skipped: true,
+              reason: "post-sweep enqueue lost to a concurrent tick"
             });
           }
-        } else {
-          ctx.eventBus().emit("scheduler.job.executed", {
-            name: `${SCHEDULER_CUSTOM_JOB}:${job.name}`,
-            durationMs: 0,
-            severity: "info",
-            skipped: true,
-            reason: `active job ${active.id} already exists`
-          });
           return;
         }
       }
-      await queue.enqueue(SCHEDULER_CUSTOM_JOB, {
-        name: job.name,
-        command: job.command,
-        ...historyProducerExclusiveKeyFor(job.command) !== undefined && {
-          exclusiveKey: historyProducerExclusiveKeyFor(job.command)
-        }
-      }, { maxRetries: 1 });
+      ctx.eventBus().emit("scheduler.job.executed", {
+        name: `${SCHEDULER_CUSTOM_JOB}:${job.name}`,
+        durationMs: 0,
+        severity: "info",
+        skipped: true,
+        reason: `active job ${active?.id ?? "unknown"} already exists`
+      });
     });
     registrations.push({
       name: job.name,
@@ -122126,7 +122214,16 @@ async function startServer(options, deps = defaultDeps) {
           return handleSchedulerCustomJob({
             cwd: ctx.cwd,
             executor: childExecutor,
-            resolveTimeoutMs: (name) => resolveSchedulerJobTimeoutMs(name, env, schedulerCustomTimeoutMs)
+            resolveTimeoutMs: (name) => resolveSchedulerJobTimeoutMs(name, env, schedulerCustomTimeoutMs),
+            onDuplicate: (name) => {
+              ctx.eventBus().emit("scheduler.job.executed", {
+                name: `${SCHEDULER_CUSTOM_JOB}:${name}`,
+                durationMs: 0,
+                severity: "info",
+                skipped: true,
+                reason: `duplicate execution suppressed; ${name} is already running in this process`
+              });
+            }
           }, job);
         });
         const unlimitedJobNames = appRt.config.scheduler.jobs.filter((job) => resolveSchedulerJobTimeoutMs(job.name, env, schedulerCustomTimeoutMs) === null).map((job) => job.name);