@pstdio/pocketcoder-cli 0.7.2 → 0.7.3

package/dist/index.js

@@ -5214,7 +5214,7 @@ function isYargsInstance(y) {
 var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 // package.json
-var version = "0.7.2";
+var version = "0.7.3";
 
 // src/command/cli-context.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3, statSync as statSync3 } from "fs";
@@ -21248,6 +21248,17 @@ function sqlValues(values) {
 }
 var timestamptz = (name2) => timestamp2(name2, { withTimezone: true, mode: "date" });
 
+// ../db/src/schema/structured-json.ts
+var structuredJson = customType2({
+  dataType: () => "jsonb",
+  codec: "jsonb",
+  fromDriver: (value) => typeof value === "string" ? JSON.parse(value) : value
+});
+function structuredJsonValue(column) {
+  return sql`CASE WHEN jsonb_typeof(${column}) = 'string'
+    THEN (${column} #>> '{}')::jsonb ELSE ${column} END`;
+}
+
 // ../db/src/schema/access.ts
 function createAccessTables(table2 = pgTable) {
   const templates2 = table2("templates", {
@@ -21256,7 +21267,7 @@ function createAccessTables(table2 = pgTable) {
     version: text2("version").notNull(),
     digest: text2("digest").notNull().unique(),
     description: text2("description"),
-    spec: jsonb("spec").$type().notNull(),
+    spec: structuredJson("spec").$type().notNull(),
     status: text2("status").$type().notNull(),
     createdAt: timestamptz("created_at").notNull(),
     retiredAt: timestamptz("retired_at")
@@ -37314,7 +37325,7 @@ function createActivityTables(table2 = pgTable, { workspaces: workspaces2 }) {
     role: text2("role").$type().notNull(),
     content: text2("content").notNull(),
     occurredAt: timestamptz("occurred_at").notNull(),
-    metadata: jsonb("metadata").$type().notNull().default({}),
+    metadata: structuredJson("metadata").$type().notNull().default({}),
     createdAt: timestamptz("created_at").notNull()
   }, (table3) => [
     primaryKey({ columns: [table3.workspaceId, table3.seq] }),
@@ -37368,9 +37379,9 @@ function createPersistenceTables(table2 = pgTable, { principals }, { workspaces:
     workspaceId: uuid("workspace_id").notNull().references(() => workspaces2.id),
     principalId: uuid("principal_id").notNull().references(() => principals.id),
     providerKind: text2("provider_kind").notNull(),
-    providerRef: jsonb("provider_ref").$type().notNull(),
+    providerRef: structuredJson("provider_ref").$type().notNull(),
     state: text2("state").$type().notNull(),
-    mountManifest: jsonb("mount_manifest").$type().notNull(),
+    mountManifest: structuredJson("mount_manifest").$type().notNull(),
     logicalBytes: bigint2("logical_bytes", { mode: "number" }),
     fileCount: bigint2("file_count", { mode: "number" }),
     retainedUntil: timestamptz("retained_until"),
@@ -37393,11 +37404,11 @@ function createPersistenceTables(table2 = pgTable, { principals }, { workspaces:
     state: text2("state").$type().notNull(),
     reasonCode: text2("reason_code").$type(),
     providerKind: text2("provider_kind").notNull(),
-    providerRef: jsonb("provider_ref").$type(),
-    templateSnapshot: jsonb("template_snapshot").$type().notNull(),
+    providerRef: structuredJson("provider_ref").$type(),
+    templateSnapshot: structuredJson("template_snapshot").$type().notNull(),
     templateDigest: text2("template_digest").notNull(),
-    sourceProvenance: jsonb("source_provenance").$type(),
-    manifest: jsonb("manifest").$type(),
+    sourceProvenance: structuredJson("source_provenance").$type(),
+    manifest: structuredJson("manifest").$type(),
     manifestDigest: text2("manifest_digest"),
     logicalBytes: bigint2("logical_bytes", { mode: "number" }),
     storedBytes: bigint2("stored_bytes", { mode: "number" }),
@@ -37452,7 +37463,7 @@ function createWorkspaceTables(table2 = pgTable, { principals, machineKeys, temp
     templateName: text2("template_name").notNull(),
     templateVersion: text2("template_version").notNull(),
     templateDigest: text2("template_digest").notNull(),
-    templateSnapshot: jsonb("template_snapshot").$type().notNull(),
+    templateSnapshot: structuredJson("template_snapshot").$type().notNull(),
     state: text2("state").$type().notNull(),
     reasonCode: text2("reason_code").$type(),
     agentState: text2("agent_state").$type().notNull().default("unknown"),
@@ -37463,9 +37474,9 @@ function createWorkspaceTables(table2 = pgTable, { principals, machineKeys, temp
     failureLogTailTruncated: boolean2("failure_log_tail_truncated").notNull().default(false),
     failureLastLogSeq: bigint2("failure_last_log_seq", { mode: "number" }),
     terminalIntent: text2("terminal_intent").$type(),
-    launchInput: jsonb("launch_input").$type(),
+    launchInput: structuredJson("launch_input").$type(),
     providerKind: text2("provider_kind"),
-    providerRef: jsonb("provider_ref").$type(),
+    providerRef: structuredJson("provider_ref").$type(),
     provisioningMode: text2("provisioning_mode").$type(),
     registrationDigest: bytea2("registration_digest").$type(),
     registrationExpiresAt: timestamptz("registration_expires_at"),
@@ -37476,20 +37487,20 @@ function createWorkspaceTables(table2 = pgTable, { principals, machineKeys, temp
     readyAt: timestamptz("ready_at"),
     lastActivityAt: timestamptz("last_activity_at"),
     launchAttempts: integer("launch_attempts").notNull().default(0),
-    health: jsonb("health").$type().notNull().default({}),
-    metadata: jsonb("metadata").$type().notNull().default({}),
+    health: structuredJson("health").$type().notNull().default({}),
+    metadata: structuredJson("metadata").$type().notNull().default({}),
     deadlineAt: timestamptz("deadline_at").notNull(),
     createdAt: timestamptz("created_at").notNull(),
     updatedAt: timestamptz("updated_at").notNull(),
     terminalAt: timestamptz("terminal_at"),
     originWorkspaceId: uuid("origin_workspace_id"),
     restoredFromCheckpointId: uuid("restored_from_checkpoint_id"),
-    sourceDescriptor: jsonb("source_descriptor").$type(),
-    resolvedSource: jsonb("resolved_source").$type(),
+    sourceDescriptor: structuredJson("source_descriptor").$type(),
+    resolvedSource: structuredJson("resolved_source").$type(),
     persistenceCapability: text2("persistence_capability").$type().notNull().default("filesystem_only"),
     latestCheckpointId: uuid("latest_checkpoint_id"),
     launchMode: text2("launch_mode").$type().notNull().default("create"),
-    outputs: jsonb("outputs").$type().notNull().default({})
+    outputs: structuredJson("outputs").$type().notNull().default({})
   }, (table3) => [
     check("workspaces_state_check", sql`${table3.state} IN ${sqlValues(WORKSPACE_STATES)}`),
     check("workspaces_reason_code_check", sql`${table3.reasonCode} IS NULL OR ${table3.reasonCode} IN ${sqlValues(REASON_CODES)}`),
@@ -37552,7 +37563,7 @@ function createWorkspaceTables(table2 = pgTable, { principals, machineKeys, temp
     driverKind: text2("driver_kind").notNull(),
     eligibilityFingerprint: text2("eligibility_fingerprint").notNull(),
     state: text2("state").$type().notNull(),
-    providerRef: jsonb("provider_ref").$type(),
+    providerRef: structuredJson("provider_ref").$type(),
     enrollmentDigest: bytea2("enrollment_digest").$type(),
     enrollmentExpiresAt: timestamptz("enrollment_expires_at"),
     workspaceId: uuid("workspace_id").references(() => workspaces2.id),
@@ -37944,7 +37955,7 @@ function createOutputs({ db, tables: { workspaceOutputs: outputs2, workspaces: w
         const row = { ...input, seq: requiredRow(latest).seq + 1 };
         await tx.insert(outputs2).values({ ...row, value: row.value === null ? sql`'null'::jsonb` : row.value });
         await tx.update(workspaces3).set({
-          outputs: sql`${workspaces3.outputs} || jsonb_build_object(${input.name}::text, ${sql.param(input.value, outputs2.value)}::jsonb)`,
+          outputs: sql`${structuredJsonValue(workspaces3.outputs)} || jsonb_build_object(${input.name}::text, ${sql.param(input.value, outputs2.value)}::jsonb)`,
           updatedAt: input.occurredAt
         }).where(eq(workspaces3.id, input.workspaceId));
         return row;
@@ -39664,7 +39675,7 @@ function createWorkspaces(context) {
         const cursor = db.select({ createdAt: workspaces3.createdAt, id: workspaces3.id }).from(workspaces3).where(and(eq(workspaces3.id, filter.cursor), eq(workspaces3.principalId, principalId)));
         cursorFilter = sql`(${workspaces3.createdAt}, ${workspaces3.id}) < (${cursor})`;
       }
-      const rows = await db.select().from(workspaces3).where(and(eq(workspaces3.principalId, principalId), filter.externalId ? eq(workspaces3.externalId, filter.externalId) : undefined, filter.state ? eq(workspaces3.state, filter.state) : undefined, filter.template ? eq(workspaces3.templateName, filter.template) : undefined, filter.metadata ? sql`${workspaces3.metadata} @> ${sql.param(filter.metadata, workspaces3.metadata)}::jsonb` : undefined, filter.createdAfter ? gte(workspaces3.createdAt, filter.createdAfter) : undefined, filter.createdBefore ? lt(workspaces3.createdAt, filter.createdBefore) : undefined, cursorFilter)).orderBy(desc2(workspaces3.createdAt), desc2(workspaces3.id)).limit(filter.limit);
+      const rows = await db.select().from(workspaces3).where(and(eq(workspaces3.principalId, principalId), filter.externalId ? eq(workspaces3.externalId, filter.externalId) : undefined, filter.state ? eq(workspaces3.state, filter.state) : undefined, filter.template ? eq(workspaces3.templateName, filter.template) : undefined, filter.metadata ? sql`${structuredJsonValue(workspaces3.metadata)} @> ${sql.param(filter.metadata, workspaces3.metadata)}::jsonb` : undefined, filter.createdAfter ? gte(workspaces3.createdAt, filter.createdAfter) : undefined, filter.createdBefore ? lt(workspaces3.createdAt, filter.createdBefore) : undefined, cursorFilter)).orderBy(desc2(workspaces3.createdAt), desc2(workspaces3.id)).limit(filter.limit);
       return rows.map(workspaceFromRow);
     }
   };
@@ -41480,6 +41491,43 @@ class PersistenceCheckpointService {
 
 // ../server/src/persistence/persistence-maintenance.ts
 import { randomUUID as randomUUID13 } from "crypto";
+
+// ../server/src/persistence/persistence-cleanup.ts
+async function cleanupPreservedStorage(context, storageId) {
+  const { store, driver } = context.deps;
+  const storage = await store.getStorage(storageId);
+  if (storage?.state !== "retained")
+    return;
+  if (storage.lastErrorCode && storage.lastErrorCode !== "storage_cleanup_failed")
+    return;
+  const workspace = await store.getWorkspace(storage.workspaceId);
+  if (workspace?.state !== "preserved" || !workspace.terminalAt)
+    return;
+  const checkpoints = (await store.listCheckpoints(storage.principalId)).filter((checkpoint) => checkpoint.storageId === storage.id);
+  if (checkpoints.length === 0 || checkpoints.some((checkpoint) => checkpoint.state !== "deleted"))
+    return;
+  const checkpointIds = new Set(checkpoints.map((checkpoint) => checkpoint.id));
+  const operations = await store.listIncompleteOperations();
+  if (operations.some((operation) => operation.workspaceId === workspace.id || operation.resultWorkspaceId === workspace.id || operation.checkpointId !== null && checkpointIds.has(operation.checkpointId)))
+    return;
+  try {
+    if ((await driver.list()).some((provider) => provider.workspaceId === workspace.id))
+      return;
+    await context.storageDriver().deleteStorage(storage.providerRef);
+    const now = context.now();
+    await store.updateWorkspaceStorage(storage.id, {
+      state: "deleted",
+      deletedAt: now,
+      retainedUntil: null,
+      lastErrorCode: null
+    }, now);
+  } catch (error51) {
+    await store.updateWorkspaceStorage(storage.id, { lastErrorCode: "storage_cleanup_failed" }, context.now());
+    context.deps.log?.(`storage cleanup ${storage.id}: ${error51 instanceof Error ? error51.message : String(error51)}`);
+  }
+}
+
+// ../server/src/persistence/persistence-maintenance.ts
 class PersistenceMaintenanceService {
   context;
   constructor(context) {
@@ -41531,6 +41579,10 @@ class PersistenceMaintenanceService {
           this.context.deps.log?.(`retention ${checkpoint.id}: ${error51 instanceof Error ? error51.message : String(error51)}`);
         }
       }
+      const deletedCheckpoints = await this.context.deps.store.listCheckpoints(principal.id, { state: "deleted" });
+      for (const storageId of new Set(deletedCheckpoints.map((checkpoint) => checkpoint.storageId))) {
+        await cleanupPreservedStorage(this.context, storageId);
+      }
     }
     return { deleted, skipped, transcriptsDeleted };
   }
@@ -41557,8 +41609,14 @@ class PersistenceMaintenanceService {
   async delete(principal, checkpointId, idempotencyKey) {
     const requestDigest = digestOf({ checkpoint_id: checkpointId });
     const replay = await this.context.replayedOperation(principal.id, "delete", idempotencyKey, requestDigest, "Changed delete request.");
-    if (replay)
+    if (replay) {
+      if (replay.state === "succeeded") {
+        const checkpoint2 = await this.context.deps.store.getCheckpoint(checkpointId);
+        if (checkpoint2)
+          await cleanupPreservedStorage(this.context, checkpoint2.storageId);
+      }
       return replay;
+    }
     const checkpoint = await this.context.getCheckpointOwned(principal, checkpointId);
     const activeRestore = (await this.context.deps.store.listIncompleteOperations()).some((operation) => operation.kind === "restore" && operation.checkpointId === checkpoint.id);
     if (activeRestore) {
@@ -41602,6 +41660,7 @@ class PersistenceMaintenanceService {
     } catch {
       await this.context.failOperation(inserted.operation.id, "checkpoint_failed");
     }
+    await cleanupPreservedStorage(this.context, checkpoint.storageId);
     return await this.context.deps.store.getOperation(inserted.operation.id) ?? inserted.operation;
   }
 }
@@ -52024,8 +52083,7 @@ async function startPocketCoderServer(config2 = loadConfig(), options = {}) {
     const url2 = `http://${healthHost}:${server.port}`;
     log(`listening on http://${config2.listenHost}:${server.port}`);
     log(`workspaces reach this server at ${config2.workspaceServerUrl}`);
-    if (warmPool)
-      warmPool.reconcile().catch((error51) => log(`warm pool initial reconcile failed: ${String(error51)}`));
+    const initialWarmPool = warmPool?.reconcile().catch((error51) => log(`warm pool initial reconcile failed: ${String(error51)}`));
     let stopPromise = null;
     return {
       config: config2,
@@ -52041,6 +52099,7 @@ async function startPocketCoderServer(config2 = loadConfig(), options = {}) {
           if (warmPoolTimer)
             clearInterval(warmPoolTimer);
           await server.stop(true);
+          await initialWarmPool;
           await store.close();
         })();
         return stopPromise;

package/package.json

@@ -6,7 +6,7 @@
       "type:app"
     ]
   },
-  "version": "0.7.2",
+  "version": "0.7.3",
   "private": false,
   "description": "Operator and diagnostics CLI for PocketCoder.",
   "type": "module",