@kyan-du/agent-wechat-cli 0.14.5 → 0.14.6

package/dist/cli.js

@@ -9410,9 +9410,26 @@ function isReconcileableContainer(info, inventory) {
   const id = inventory?.containerId;
   return Boolean(id && (info.Id === id || info.Id.startsWith(id) || id.startsWith(info.Id)));
 }
+function inventoryBinding(live, inventory) {
+  if (!inventory) return "absent";
+  if (live && !isReconcileableContainer(live, inventory)) return "stale";
+  return "trusted";
+}
 function hasOwnedVolume(existing, name, role) {
   return existing.Name === name && existing.Driver === "local" && existing.Labels?.[INSTANCE_LABEL] === "default" && existing.Labels?.[VOLUME_ROLE_LABEL] === role;
 }
+var DESTINATIONS = ["/data", "/home/wechat"];
+function sameFixedInstance(evidence) {
+  if (evidence.containerName !== evidence.inventory.containerName) return false;
+  const roles = ["data", "wechat-home"];
+  return roles.every((role, index) => {
+    const volume = evidence.volumes[index];
+    const name = evidence.inventory.volumes[index];
+    if (!volume || !hasOwnedVolume(volume, name, role)) return false;
+    const mounted = (evidence.mounts ?? []).filter((mount) => mount.Destination === DESTINATIONS[index]);
+    return mounted.length === 1 && mounted[0].Type === "volume" && mounted[0].Name === name;
+  });
+}
 
 // src/lifecycle.ts
 function docker(args, options = {}) {
@@ -9511,6 +9528,17 @@ function assertOwnedVolumes(inventory) {
 function assertOwnedContainer(info, inventory) {
   if (!isReconcileableContainer(info, inventory)) throw new CliError("CONTAINER_OWNERSHIP_MISMATCH", "refusing to operate on an unowned container with the fixed name", EXIT.ENVIRONMENT);
 }
+function rebindIfSameInstance(info, inventory) {
+  if (isReconcileableContainer(info, inventory)) return inventory;
+  const roles = ["data", "wechat-home"];
+  const volumes = roles.map((_role, index) => inspectVolume(inventory.volumes[index]));
+  if (!sameFixedInstance({ containerName: CONTAINER_NAME, volumes, mounts: info.Mounts, inventory })) {
+    throw new CliError("CONTAINER_OWNERSHIP_MISMATCH", "refusing to operate on an unowned container with the fixed name", EXIT.ENVIRONMENT);
+  }
+  const next = { ...inventory, containerId: info.Id, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+  saveInventory(next);
+  return next;
+}
 function clearContainerIdentity(inventory) {
   const info = inspectContainer();
   if (!info) throw new CliError("INSTANCE_NOT_RUNNING", "trusted container is required to clear container identity", EXIT.CLEANUP);
@@ -9578,14 +9606,14 @@ async function startInstance(options) {
   const existing = inspectContainer();
   const current = loadInventory();
   if (existing) {
-    assertOwnedContainer(existing, current);
+    if (!current) throw new CliError("INSTANCE_INVENTORY_MISSING", "existing container has no trusted inventory", EXIT.ENVIRONMENT);
+    const bound = rebindIfSameInstance(existing, current);
     if (options.outbound && Object.keys(options.outbound).length > 0) {
       throw new CliError("OUTBOUND_RESTART_REQUIRED", "outbound policy changed; run wx restart to recreate the container", EXIT.ARGUMENT);
     }
-    if (!current) throw new CliError("INSTANCE_INVENTORY_MISSING", "existing container has no trusted inventory", EXIT.ENVIRONMENT);
     if (!existing.State?.Running) docker(["start", CONTAINER_NAME], { inherit: true });
     await waitCompatible(options.token);
-    return current;
+    return bound;
   }
   const selected = resolveImage({ explicit: options.image, pull: options.pull, noPull: options.noPull, localDefault: options.localDefault });
   const provisional = createInventory(selected.requestedReference, options.identity, selected.digest);
@@ -9634,8 +9662,8 @@ function stopInstance() {
   const info = inspectContainer();
   if (!info) return { stopped: false };
   const inventory = loadInventory();
-  assertOwnedContainer(info, inventory);
   if (!inventory) throw new CliError("INSTANCE_INVENTORY_MISSING", "refusing to remove an unowned container", EXIT.ENVIRONMENT);
+  rebindIfSameInstance(info, inventory);
   docker(["rm", "-f", info.Id], { inherit: true });
   return { stopped: true };
 }
@@ -9676,8 +9704,8 @@ async function replaceImage(options) {
   const previous = loadInventory();
   if (!previous) throw new CliError("INSTANCE_INVENTORY_MISSING", "start the instance before image upgrade", EXIT.ENVIRONMENT);
   const info = inspectContainer();
-  if (info) assertOwnedContainer(info, previous);
-  const reconciled = previous;
+  if (info) rebindIfSameInstance(info, previous);
+  const reconciled = loadInventory() ?? previous;
   const selected = resolveImage({ explicit: options.image, pull: true, localDefault: previous.imageRef });
   if (selected.digest === reconciled.imageDigest) return reconciled;
   if (info) {
@@ -9779,7 +9807,7 @@ function checkCliUpgrade(currentVersion, readLatest = () => execFileSync2("npm",
 }
 
 // src/cli.ts
-var VERSION = false ? "0.0.0-test" : "0.14.5";
+var VERSION = false ? "0.0.0-test" : "0.14.6";
 var MAX_UPLOAD_BYTES = 50 * 1024 * 1024;
 function readToken() {
   try {
@@ -9942,15 +9970,12 @@ function programStatus() {
   const inventory = loadInventory();
   if (!dockerAvailable()) throw new CliError("DOCKER_UNAVAILABLE", "Docker daemon is unavailable", EXIT.ENVIRONMENT, { diagnostics: { docker: "unavailable", inventory: inventory ? "trusted" : "absent" } });
   const container = inspectContainer();
-  if (container) {
-    if (!inventory) throw new CliError("INSTANCE_INVENTORY_MISSING", "existing container has no trusted inventory", EXIT.ENVIRONMENT);
-  }
   return {
     cliVersion: VERSION,
     docker: "available",
     container: container ? container.State?.Running ? "running" : "stopped" : "absent",
     imageDigest: inventory?.imageDigest,
-    inventory: inventory ? "trusted" : "absent"
+    inventory: inventoryBinding(container, inventory)
   };
 }
 async function syncServer(binary, sha256) {

package/dist/image-compatibility.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "cliVersion": "0.14.5",
+  "cliVersion": "0.14.6",
   "repository": "ghcr.io/kyan-du/agent-wechat",
   "apiVersion": 1,
   "allowedReferences": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kyan-du/agent-wechat-cli",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "type": "module",
   "bin": {
     "wx": "./dist/cli.js"