@abyssinia-labs/sokie 0.3.1 → 0.4.0

package/dist/sokie.mjs

@@ -287,8 +287,8 @@ var require_directives = __commonJS((exports) => {
         this.atNextDocument = false;
       }
       const parts = line.trim().split(/[ \t]+/);
-      const name = parts.shift();
-      switch (name) {
+      const name2 = parts.shift();
+      switch (name2) {
         case "%TAG": {
           if (parts.length !== 2) {
             onError(0, "%TAG directive should contain exactly two parts");
@@ -316,7 +316,7 @@ var require_directives = __commonJS((exports) => {
           }
         }
         default:
-          onError(0, `Unknown directive ${name}`, true);
+          onError(0, `Unknown directive ${name2}`, true);
           return false;
       }
     }
@@ -413,9 +413,9 @@ var require_anchors = __commonJS((exports) => {
   }
   function findNewAnchor(prefix, exclude) {
     for (let i2 = 1;; ++i2) {
-      const name = `${prefix}${i2}`;
-      if (!exclude.has(name))
-        return name;
+      const name2 = `${prefix}${i2}`;
+      if (!exclude.has(name2))
+        return name2;
     }
   }
   function createNodeAnchors(doc, prefix) {
@@ -1411,8 +1411,8 @@ var require_stringify = __commonJS((exports) => {
       tagObj = tags.find((t) => t.nodeClass && obj instanceof t.nodeClass);
     }
     if (!tagObj) {
-      const name = obj?.constructor?.name ?? (obj === null ? "null" : typeof obj);
-      throw new Error(`Tag not resolved for ${name} value`);
+      const name2 = obj?.constructor?.name ?? (obj === null ? "null" : typeof obj);
+      throw new Error(`Tag not resolved for ${name2} value`);
     }
     return tagObj;
   }
@@ -3267,10 +3267,10 @@ var require_Document = __commonJS((exports) => {
       if (assertCollection(this.contents))
         this.contents.addIn(path, value);
     }
-    createAlias(node, name) {
+    createAlias(node, name2) {
       if (!node.anchor) {
         const prev = anchors.anchorNames(this);
-        node.anchor = !name || prev.has(name) ? anchors.findNewAnchor(name || "a", prev) : name;
+        node.anchor = !name2 || prev.has(name2) ? anchors.findNewAnchor(name2 || "a", prev) : name2;
       }
       return new Alias.Alias(node.anchor);
     }
@@ -3431,9 +3431,9 @@ var require_Document = __commonJS((exports) => {
 // ../../node_modules/yaml/dist/errors.js
 var require_errors = __commonJS((exports) => {
   class YAMLError extends Error {
-    constructor(name, pos, code2, message) {
+    constructor(name2, pos, code2, message) {
       super();
-      this.name = name;
+      this.name = name2;
       this.code = code2;
       this.message = message;
       this.pos = pos;
@@ -4053,8 +4053,8 @@ var require_resolve_flow_collection = __commonJS((exports) => {
     if (ce?.source === expectedEnd)
       cePos = ce.offset + ce.source.length;
     else {
-      const name = fcName[0].toUpperCase() + fcName.substring(1);
-      const msg = atRoot ? `${name} must end with a ${expectedEnd}` : `${name} in block collection must be sufficiently indented and end with a ${expectedEnd}`;
+      const name2 = fcName[0].toUpperCase() + fcName.substring(1);
+      const msg = atRoot ? `${name2} must end with a ${expectedEnd}` : `${name2} in block collection must be sufficiently indented and end with a ${expectedEnd}`;
       onError(offset, atRoot ? "MISSING_CHAR" : "BAD_INDENT", msg);
       if (ce && ce.source.length !== 1)
         ee.unshift(ce);
@@ -7046,9 +7046,9 @@ var require_inspect = __commonJS((exports) => {
   function getObjectTag(object2) {
     const tag = Object.prototype.toString.call(object2).replace(/^\[object /, "").replace(/]$/, "");
     if (tag === "Object" && typeof object2.constructor === "function") {
-      const name = object2.constructor.name;
-      if (typeof name === "string" && name !== "") {
-        return name;
+      const name2 = object2.constructor.name;
+      if (typeof name2 === "string" && name2 !== "") {
+        return name2;
       }
     }
     return tag;
@@ -8483,8 +8483,8 @@ var require_printer = __commonJS((exports) => {
     },
     SelectionSet: { leave: ({ selections }) => block(selections) },
     Field: {
-      leave({ alias, name, arguments: args, directives, selectionSet }) {
-        const prefix = join([wrap("", alias, ": "), name], "");
+      leave({ alias, name: name2, arguments: args, directives, selectionSet }) {
+        const prefix = join([wrap("", alias, ": "), name2], "");
         return join([
           wrappedLineAndArgs(prefix, args),
           wrap(" ", join(directives, " ")),
@@ -8492,11 +8492,11 @@ var require_printer = __commonJS((exports) => {
         ]);
       }
     },
-    Argument: { leave: ({ name, value }) => name + ": " + value },
-    FragmentArgument: { leave: ({ name, value }) => name + ": " + value },
+    Argument: { leave: ({ name: name2, value }) => name2 + ": " + value },
+    FragmentArgument: { leave: ({ name: name2, value }) => name2 + ": " + value },
     FragmentSpread: {
-      leave: ({ name, arguments: args, directives }) => {
-        const prefix = "..." + name;
+      leave: ({ name: name2, arguments: args, directives }) => {
+        const prefix = "..." + name2;
         return wrappedLineAndArgs(prefix, args) + wrap(" ", join(directives, " "));
       }
     },
@@ -8509,8 +8509,8 @@ var require_printer = __commonJS((exports) => {
       ], " ")
     },
     FragmentDefinition: {
-      leave: ({ name, typeCondition, variableDefinitions, directives, selectionSet, description }) => wrap("", description, `
-`) + `fragment ${name}${wrap("(", join(variableDefinitions, ", "), ")")} ` + `on ${typeCondition} ${wrap("", join(directives, " "), " ")}` + selectionSet
+      leave: ({ name: name2, typeCondition, variableDefinitions, directives, selectionSet, description }) => wrap("", description, `
+`) + `fragment ${name2}${wrap("(", join(variableDefinitions, ", "), ")")} ` + `on ${typeCondition} ${wrap("", join(directives, " "), " ")}` + selectionSet
     },
     IntValue: { leave: ({ value }) => value },
     FloatValue: { leave: ({ value }) => value },
@@ -8538,11 +8538,11 @@ var require_printer = __commonJS((exports) => {
         return fieldsLine.length > MAX_LINE_LENGTH ? block(fields) : fieldsLine;
       }
     },
-    ObjectField: { leave: ({ name, value }) => name + ": " + value },
+    ObjectField: { leave: ({ name: name2, value }) => name2 + ": " + value },
     Directive: {
-      leave: ({ name, arguments: args }) => "@" + name + wrap("(", join(args, ", "), ")")
+      leave: ({ name: name2, arguments: args }) => "@" + name2 + wrap("(", join(args, ", "), ")")
     },
-    NamedType: { leave: ({ name }) => name },
+    NamedType: { leave: ({ name: name2 }) => name2 },
     ListType: { leave: ({ type }) => "[" + type + "]" },
     NonNullType: { leave: ({ type }) => type + "!" },
     SchemaDefinition: {
@@ -8553,59 +8553,59 @@ var require_printer = __commonJS((exports) => {
       leave: ({ operation, type }) => operation + ": " + type
     },
     ScalarTypeDefinition: {
-      leave: ({ description, name, directives }) => wrap("", description, `
-`) + join(["scalar", name, join(directives, " ")], " ")
+      leave: ({ description, name: name2, directives }) => wrap("", description, `
+`) + join(["scalar", name2, join(directives, " ")], " ")
     },
     ObjectTypeDefinition: {
-      leave: ({ description, name, interfaces, directives, fields }) => wrap("", description, `
+      leave: ({ description, name: name2, interfaces, directives, fields }) => wrap("", description, `
 `) + join([
         "type",
-        name,
+        name2,
         wrap("implements ", join(interfaces, " & ")),
         join(directives, " "),
         block(fields)
       ], " ")
     },
     FieldDefinition: {
-      leave: ({ description, name, arguments: args, type, directives }) => wrap("", description, `
-`) + name + (hasMultilineItems(args) ? wrap(`(
+      leave: ({ description, name: name2, arguments: args, type, directives }) => wrap("", description, `
+`) + name2 + (hasMultilineItems(args) ? wrap(`(
 `, indent(join(args, `
 `)), `
 )`) : wrap("(", join(args, ", "), ")")) + ": " + type + wrap(" ", join(directives, " "))
     },
     InputValueDefinition: {
-      leave: ({ description, name, type, defaultValue, directives }) => wrap("", description, `
-`) + join([name + ": " + type, wrap("= ", defaultValue), join(directives, " ")], " ")
+      leave: ({ description, name: name2, type, defaultValue, directives }) => wrap("", description, `
+`) + join([name2 + ": " + type, wrap("= ", defaultValue), join(directives, " ")], " ")
     },
     InterfaceTypeDefinition: {
-      leave: ({ description, name, interfaces, directives, fields }) => wrap("", description, `
+      leave: ({ description, name: name2, interfaces, directives, fields }) => wrap("", description, `
 `) + join([
         "interface",
-        name,
+        name2,
         wrap("implements ", join(interfaces, " & ")),
         join(directives, " "),
         block(fields)
       ], " ")
     },
     UnionTypeDefinition: {
-      leave: ({ description, name, directives, types }) => wrap("", description, `
-`) + join(["union", name, join(directives, " "), wrap("= ", join(types, " | "))], " ")
+      leave: ({ description, name: name2, directives, types }) => wrap("", description, `
+`) + join(["union", name2, join(directives, " "), wrap("= ", join(types, " | "))], " ")
     },
     EnumTypeDefinition: {
-      leave: ({ description, name, directives, values }) => wrap("", description, `
-`) + join(["enum", name, join(directives, " "), block(values)], " ")
+      leave: ({ description, name: name2, directives, values }) => wrap("", description, `
+`) + join(["enum", name2, join(directives, " "), block(values)], " ")
     },
     EnumValueDefinition: {
-      leave: ({ description, name, directives }) => wrap("", description, `
-`) + join([name, join(directives, " ")], " ")
+      leave: ({ description, name: name2, directives }) => wrap("", description, `
+`) + join([name2, join(directives, " ")], " ")
     },
     InputObjectTypeDefinition: {
-      leave: ({ description, name, directives, fields }) => wrap("", description, `
-`) + join(["input", name, join(directives, " "), block(fields)], " ")
+      leave: ({ description, name: name2, directives, fields }) => wrap("", description, `
+`) + join(["input", name2, join(directives, " "), block(fields)], " ")
     },
     DirectiveDefinition: {
-      leave: ({ description, name, arguments: args, directives, repeatable, locations }) => wrap("", description, `
-`) + "directive @" + name + (hasMultilineItems(args) ? wrap(`(
+      leave: ({ description, name: name2, arguments: args, directives, repeatable, locations }) => wrap("", description, `
+`) + "directive @" + name2 + (hasMultilineItems(args) ? wrap(`(
 `, indent(join(args, `
 `)), `
 )`) : wrap("(", join(args, ", "), ")")) + wrap(" ", join(directives, " ")) + (repeatable ? " repeatable" : "") + " on " + join(locations, " | ")
@@ -8614,53 +8614,53 @@ var require_printer = __commonJS((exports) => {
       leave: ({ directives, operationTypes }) => join(["extend schema", join(directives, " "), block(operationTypes)], " ")
     },
     ScalarTypeExtension: {
-      leave: ({ name, directives }) => join(["extend scalar", name, join(directives, " ")], " ")
+      leave: ({ name: name2, directives }) => join(["extend scalar", name2, join(directives, " ")], " ")
     },
     ObjectTypeExtension: {
-      leave: ({ name, interfaces, directives, fields }) => join([
+      leave: ({ name: name2, interfaces, directives, fields }) => join([
         "extend type",
-        name,
+        name2,
         wrap("implements ", join(interfaces, " & ")),
         join(directives, " "),
         block(fields)
       ], " ")
     },
     InterfaceTypeExtension: {
-      leave: ({ name, interfaces, directives, fields }) => join([
+      leave: ({ name: name2, interfaces, directives, fields }) => join([
         "extend interface",
-        name,
+        name2,
         wrap("implements ", join(interfaces, " & ")),
         join(directives, " "),
         block(fields)
       ], " ")
     },
     UnionTypeExtension: {
-      leave: ({ name, directives, types }) => join([
+      leave: ({ name: name2, directives, types }) => join([
         "extend union",
-        name,
+        name2,
         join(directives, " "),
         wrap("= ", join(types, " | "))
       ], " ")
     },
     EnumTypeExtension: {
-      leave: ({ name, directives, values }) => join(["extend enum", name, join(directives, " "), block(values)], " ")
+      leave: ({ name: name2, directives, values }) => join(["extend enum", name2, join(directives, " "), block(values)], " ")
     },
     InputObjectTypeExtension: {
-      leave: ({ name, directives, fields }) => join(["extend input", name, join(directives, " "), block(fields)], " ")
+      leave: ({ name: name2, directives, fields }) => join(["extend input", name2, join(directives, " "), block(fields)], " ")
     },
     DirectiveExtension: {
-      leave: ({ name, directives }) => join(["extend directive @" + name, join(directives, " ")], " ")
+      leave: ({ name: name2, directives }) => join(["extend directive @" + name2, join(directives, " ")], " ")
     },
-    TypeCoordinate: { leave: ({ name }) => name },
+    TypeCoordinate: { leave: ({ name: name2 }) => name2 },
     MemberCoordinate: {
-      leave: ({ name, memberName }) => join([name, wrap(".", memberName)])
+      leave: ({ name: name2, memberName }) => join([name2, wrap(".", memberName)])
     },
     ArgumentCoordinate: {
-      leave: ({ name, fieldName, argumentName }) => join([name, wrap(".", fieldName), wrap("(", argumentName, ":)")])
+      leave: ({ name: name2, fieldName, argumentName }) => join([name2, wrap(".", fieldName), wrap("(", argumentName, ":)")])
     },
-    DirectiveCoordinate: { leave: ({ name }) => join(["@", name]) },
+    DirectiveCoordinate: { leave: ({ name: name2 }) => join(["@", name2]) },
     DirectiveArgumentCoordinate: {
-      leave: ({ name, argumentName }) => join(["@", name, wrap("(", argumentName, ":)")])
+      leave: ({ name: name2, argumentName }) => join(["@", name2, wrap("(", argumentName, ":)")])
     }
   };
   function join(maybeArray, separator = "") {
@@ -8731,25 +8731,25 @@ var require_assertName = __commonJS((exports) => {
   exports.assertEnumValueName = assertEnumValueName;
   var GraphQLError_ts_1 = require_GraphQLError();
   var characterClasses_ts_1 = require_characterClasses();
-  function assertName(name) {
-    if (name.length === 0) {
+  function assertName(name2) {
+    if (name2.length === 0) {
       throw new GraphQLError_ts_1.GraphQLError("Expected name to be a non-empty string.");
     }
-    for (let i2 = 1;i2 < name.length; ++i2) {
-      if (!(0, characterClasses_ts_1.isNameContinue)(name.charCodeAt(i2))) {
-        throw new GraphQLError_ts_1.GraphQLError(`Names must only contain [_a-zA-Z0-9] but "${name}" does not.`);
+    for (let i2 = 1;i2 < name2.length; ++i2) {
+      if (!(0, characterClasses_ts_1.isNameContinue)(name2.charCodeAt(i2))) {
+        throw new GraphQLError_ts_1.GraphQLError(`Names must only contain [_a-zA-Z0-9] but "${name2}" does not.`);
       }
     }
-    if (!(0, characterClasses_ts_1.isNameStart)(name.charCodeAt(0))) {
-      throw new GraphQLError_ts_1.GraphQLError(`Names must start with [_a-zA-Z] but "${name}" does not.`);
+    if (!(0, characterClasses_ts_1.isNameStart)(name2.charCodeAt(0))) {
+      throw new GraphQLError_ts_1.GraphQLError(`Names must start with [_a-zA-Z] but "${name2}" does not.`);
     }
-    return name;
+    return name2;
   }
-  function assertEnumValueName(name) {
-    if (name === "true" || name === "false" || name === "null") {
-      throw new GraphQLError_ts_1.GraphQLError(`Enum values cannot be named: ${name}`);
+  function assertEnumValueName(name2) {
+    if (name2 === "true" || name2 === "false" || name2 === "null") {
+      throw new GraphQLError_ts_1.GraphQLError(`Enum values cannot be named: ${name2}`);
     }
-    return assertName(name);
+    return assertName(name2);
   }
 });
 
@@ -9187,10 +9187,10 @@ var require_definition = __commonJS((exports) => {
   }
 
   class GraphQLField {
-    constructor(parentType, name, config2) {
+    constructor(parentType, name2, config2) {
       this.__kind = fieldSymbol;
       this.parentType = parentType;
-      this.name = (0, assertName_ts_1.assertName)(name);
+      this.name = (0, assertName_ts_1.assertName)(name2);
       this.description = config2.description;
       this.type = config2.type;
       const argsConfig = config2.args;
@@ -9226,10 +9226,10 @@ var require_definition = __commonJS((exports) => {
   exports.GraphQLField = GraphQLField;
 
   class GraphQLArgument {
-    constructor(parent, name, config2) {
+    constructor(parent, name2, config2) {
       this.__kind = argumentSymbol;
       this.parent = parent;
-      this.name = (0, assertName_ts_1.assertName)(name);
+      this.name = (0, assertName_ts_1.assertName)(name2);
       this.description = config2.description;
       this.type = config2.type;
       this.defaultValue = config2.defaultValue;
@@ -9377,9 +9377,9 @@ var require_definition = __commonJS((exports) => {
       }
       return this._values;
     }
-    getValue(name) {
+    getValue(name2) {
       this._nameLookup ??= (0, keyMap_ts_1.keyMap)(this.getValues(), (value) => value.name);
-      return this._nameLookup[name];
+      return this._nameLookup[name2];
     }
     serialize(outputValue) {
       return this.coerceOutputValue(outputValue);
@@ -9455,12 +9455,12 @@ var require_definition = __commonJS((exports) => {
   }
 
   class GraphQLEnumValue {
-    constructor(parentEnum, name, config2) {
+    constructor(parentEnum, name2, config2) {
       this.__kind = enumValueSymbol;
       this.parentEnum = parentEnum;
-      this.name = (0, assertName_ts_1.assertEnumValueName)(name);
+      this.name = (0, assertName_ts_1.assertEnumValueName)(name2);
       this.description = config2.description;
-      this.value = config2.value !== undefined ? config2.value : name;
+      this.value = config2.value !== undefined ? config2.value : name2;
       this.deprecationReason = config2.deprecationReason;
       this.extensions = (0, toObjMap_ts_1.toObjMapWithSymbols)(config2.extensions);
       this.astNode = config2.astNode;
@@ -9531,12 +9531,12 @@ var require_definition = __commonJS((exports) => {
   }
 
   class GraphQLInputField {
-    constructor(parentType, name, config2) {
+    constructor(parentType, name2, config2) {
       if (!!("resolve" in config2))
-        (0, devAssert_ts_1.devAssert)(false, `${parentType}.${name} field has a resolve property, but Input Types cannot define resolvers.`);
+        (0, devAssert_ts_1.devAssert)(false, `${parentType}.${name2} field has a resolve property, but Input Types cannot define resolvers.`);
       this.__kind = inputFieldSymbol;
       this.parentType = parentType;
-      this.name = (0, assertName_ts_1.assertName)(name);
+      this.name = (0, assertName_ts_1.assertName)(name2);
       this.description = config2.description;
       this.type = config2.type;
       this.defaultValue = config2.defaultValue;
@@ -9692,7 +9692,7 @@ var require_valueToLiteral = __commonJS((exports) => {
       }
       const fields = [];
       const fieldDefs = type.getFields();
-      const hasUndefinedField = Object.keys(value).some((name) => value[name] !== undefined && !Object.hasOwn(fieldDefs, name));
+      const hasUndefinedField = Object.keys(value).some((name2) => value[name2] !== undefined && !Object.hasOwn(fieldDefs, name2));
       if (hasUndefinedField) {
         return;
       }
@@ -10343,7 +10343,7 @@ var require_scalars = __commonJS((exports) => {
     exports.GraphQLID
   ]);
   function isSpecifiedScalarType(type) {
-    return exports.specifiedScalarTypes.some(({ name }) => type.name === name);
+    return exports.specifiedScalarTypes.some(({ name: name2 }) => type.name === name2);
   }
   function coerceOutputValueObject(outputValue) {
     if ((0, isObjectLike_ts_1.isObjectLike)(outputValue)) {
@@ -10626,7 +10626,7 @@ var require_directives2 = __commonJS((exports) => {
     exports.GraphQLOneOfDirective
   ]);
   function isSpecifiedDirective(directive) {
-    return exports.specifiedDirectives.some(({ name }) => name === directive.name);
+    return exports.specifiedDirectives.some(({ name: name2 }) => name2 === directive.name);
   }
 });
 
@@ -11211,7 +11211,7 @@ In some cases, you need to provide options to alter GraphQL's execution behavior
     type: exports.__Type,
     description: "Request the type information of a single type.",
     args: { name: { type: new definition_ts_1.GraphQLNonNull(scalars_ts_1.GraphQLString) } },
-    resolve: (_source, { name }, _context, { schema }) => schema.getType(name)
+    resolve: (_source, { name: name2 }, _context, { schema }) => schema.getType(name2)
   });
   exports.TypeNameMetaFieldDef = new definition_ts_1.GraphQLField(undefined, "__typename", {
     type: new definition_ts_1.GraphQLNonNull(scalars_ts_1.GraphQLString),
@@ -11229,7 +11229,7 @@ In some cases, you need to provide options to alter GraphQL's execution behavior
     exports.__TypeKind
   ]);
   function isIntrospectionType(type) {
-    return exports.introspectionTypes.some(({ name }) => type.name === name);
+    return exports.introspectionTypes.some(({ name: name2 }) => type.name === name2);
   }
 });
 
@@ -11356,8 +11356,8 @@ var require_schema4 = __commonJS((exports) => {
     getTypeMap() {
       return this._typeMap;
     }
-    getType(name) {
-      return this.getTypeMap()[name];
+    getType(name2) {
+      return this.getTypeMap()[name2];
     }
     getPossibleTypes(abstractType) {
       return (0, definition_ts_1.isUnionType)(abstractType) ? abstractType.getTypes() : this.getImplementations(abstractType).objects;
@@ -11385,8 +11385,8 @@ var require_schema4 = __commonJS((exports) => {
     getDirectives() {
       return this._directives;
     }
-    getDirective(name) {
-      return this.getDirectives().find((directive) => directive.name === name);
+    getDirective(name2) {
+      return this.getDirectives().find((directive) => directive.name === name2);
     }
     getField(parentType, fieldName) {
       switch (fieldName) {
@@ -12589,10 +12589,10 @@ var require_source = __commonJS((exports) => {
   var sourceSymbol = Symbol("Source");
 
   class Source {
-    constructor(body, name = "GraphQL request", locationOffset = { line: 1, column: 1 }) {
+    constructor(body, name2 = "GraphQL request", locationOffset = { line: 1, column: 1 }) {
       this.__kind = sourceSymbol;
       this.body = body;
-      this.name = name;
+      this.name = name2;
       this.locationOffset = locationOffset;
       if (!(this.locationOffset.line > 0))
         (0, devAssert_ts_1.devAssert)(false, "line in locationOffset is 1-indexed and must be positive.");
@@ -12759,15 +12759,15 @@ var require_parser2 = __commonJS((exports) => {
       }
       const description = this.parseDescription();
       const operation = this.parseOperationType();
-      let name;
+      let name2;
       if (this.peek(tokenKind_ts_1.TokenKind.NAME)) {
-        name = this.parseName();
+        name2 = this.parseName();
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.OPERATION_DEFINITION,
         operation,
         description,
-        name,
+        name: name2,
         variableDefinitions: this.parseVariableDefinitions(),
         directives: this.parseDirectives(false),
         selectionSet: this.parseSelectionSet()
@@ -12819,17 +12819,17 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       const nameOrAlias = this.parseName();
       let alias;
-      let name;
+      let name2;
       if (this.expectOptionalToken(tokenKind_ts_1.TokenKind.COLON)) {
         alias = nameOrAlias;
-        name = this.parseName();
+        name2 = this.parseName();
       } else {
-        name = nameOrAlias;
+        name2 = nameOrAlias;
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.FIELD,
         alias,
-        name,
+        name: name2,
         arguments: this.parseArguments(false),
         directives: this.parseDirectives(false),
         selectionSet: this.peek(tokenKind_ts_1.TokenKind.BRACE_L) ? this.parseSelectionSet() : undefined
@@ -12845,11 +12845,11 @@ var require_parser2 = __commonJS((exports) => {
     }
     parseArgument(isConst = false) {
       const start = this._lexer.token;
-      const name = this.parseName();
+      const name2 = this.parseName();
       this.expectToken(tokenKind_ts_1.TokenKind.COLON);
       return this.node(start, {
         kind: kinds_ts_1.Kind.ARGUMENT,
-        name,
+        name: name2,
         value: this.parseValueLiteral(isConst)
       });
     }
@@ -12858,11 +12858,11 @@ var require_parser2 = __commonJS((exports) => {
     }
     parseFragmentArgument() {
       const start = this._lexer.token;
-      const name = this.parseName();
+      const name2 = this.parseName();
       this.expectToken(tokenKind_ts_1.TokenKind.COLON);
       return this.node(start, {
         kind: kinds_ts_1.Kind.FRAGMENT_ARGUMENT,
-        name,
+        name: name2,
         value: this.parseValueLiteral(false)
       });
     }
@@ -12871,18 +12871,18 @@ var require_parser2 = __commonJS((exports) => {
       this.expectToken(tokenKind_ts_1.TokenKind.SPREAD);
       const hasTypeCondition = this.expectOptionalKeyword("on");
       if (!hasTypeCondition && this.peek(tokenKind_ts_1.TokenKind.NAME)) {
-        const name = this.parseFragmentName();
+        const name2 = this.parseFragmentName();
         if (this.peek(tokenKind_ts_1.TokenKind.PAREN_L) && this._options.experimentalFragmentArguments) {
           return this.node(start, {
             kind: kinds_ts_1.Kind.FRAGMENT_SPREAD,
-            name,
+            name: name2,
             arguments: this.parseFragmentArguments(),
             directives: this.parseDirectives(false)
           });
         }
         return this.node(start, {
           kind: kinds_ts_1.Kind.FRAGMENT_SPREAD,
-          name,
+          name: name2,
           directives: this.parseDirectives(false)
         });
       }
@@ -13009,11 +13009,11 @@ var require_parser2 = __commonJS((exports) => {
     }
     parseObjectField(isConst) {
       const start = this._lexer.token;
-      const name = this.parseName();
+      const name2 = this.parseName();
       this.expectToken(tokenKind_ts_1.TokenKind.COLON);
       return this.node(start, {
         kind: kinds_ts_1.Kind.OBJECT_FIELD,
-        name,
+        name: name2,
         value: this.parseValueLiteral(isConst)
       });
     }
@@ -13102,12 +13102,12 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       const description = this.parseDescription();
       this.expectKeyword("scalar");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const directives = this.parseConstDirectives();
       return this.node(start, {
         kind: kinds_ts_1.Kind.SCALAR_TYPE_DEFINITION,
         description,
-        name,
+        name: name2,
         directives
       });
     }
@@ -13115,14 +13115,14 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       const description = this.parseDescription();
       this.expectKeyword("type");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const interfaces = this.parseImplementsInterfaces();
       const directives = this.parseConstDirectives();
       const fields = this.parseFieldsDefinition();
       return this.node(start, {
         kind: kinds_ts_1.Kind.OBJECT_TYPE_DEFINITION,
         description,
-        name,
+        name: name2,
         interfaces,
         directives,
         fields
@@ -13137,7 +13137,7 @@ var require_parser2 = __commonJS((exports) => {
     parseFieldDefinition() {
       const start = this._lexer.token;
       const description = this.parseDescription();
-      const name = this.parseName();
+      const name2 = this.parseName();
       const args = this.parseArgumentDefs();
       this.expectToken(tokenKind_ts_1.TokenKind.COLON);
       const type = this.parseTypeReference();
@@ -13145,7 +13145,7 @@ var require_parser2 = __commonJS((exports) => {
       return this.node(start, {
         kind: kinds_ts_1.Kind.FIELD_DEFINITION,
         description,
-        name,
+        name: name2,
         arguments: args,
         type,
         directives
@@ -13157,7 +13157,7 @@ var require_parser2 = __commonJS((exports) => {
     parseInputValueDef() {
       const start = this._lexer.token;
       const description = this.parseDescription();
-      const name = this.parseName();
+      const name2 = this.parseName();
       this.expectToken(tokenKind_ts_1.TokenKind.COLON);
       const type = this.parseTypeReference();
       let defaultValue;
@@ -13168,7 +13168,7 @@ var require_parser2 = __commonJS((exports) => {
       return this.node(start, {
         kind: kinds_ts_1.Kind.INPUT_VALUE_DEFINITION,
         description,
-        name,
+        name: name2,
         type,
         defaultValue,
         directives
@@ -13178,14 +13178,14 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       const description = this.parseDescription();
       this.expectKeyword("interface");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const interfaces = this.parseImplementsInterfaces();
       const directives = this.parseConstDirectives();
       const fields = this.parseFieldsDefinition();
       return this.node(start, {
         kind: kinds_ts_1.Kind.INTERFACE_TYPE_DEFINITION,
         description,
-        name,
+        name: name2,
         interfaces,
         directives,
         fields
@@ -13195,13 +13195,13 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       const description = this.parseDescription();
       this.expectKeyword("union");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const directives = this.parseConstDirectives();
       const types = this.parseUnionMemberTypes();
       return this.node(start, {
         kind: kinds_ts_1.Kind.UNION_TYPE_DEFINITION,
         description,
-        name,
+        name: name2,
         directives,
         types
       });
@@ -13213,13 +13213,13 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       const description = this.parseDescription();
       this.expectKeyword("enum");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const directives = this.parseConstDirectives();
       const values = this.parseEnumValuesDefinition();
       return this.node(start, {
         kind: kinds_ts_1.Kind.ENUM_TYPE_DEFINITION,
         description,
-        name,
+        name: name2,
         directives,
         values
       });
@@ -13230,12 +13230,12 @@ var require_parser2 = __commonJS((exports) => {
     parseEnumValueDefinition() {
       const start = this._lexer.token;
       const description = this.parseDescription();
-      const name = this.parseEnumValueName();
+      const name2 = this.parseEnumValueName();
       const directives = this.parseConstDirectives();
       return this.node(start, {
         kind: kinds_ts_1.Kind.ENUM_VALUE_DEFINITION,
         description,
-        name,
+        name: name2,
         directives
       });
     }
@@ -13249,13 +13249,13 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       const description = this.parseDescription();
       this.expectKeyword("input");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const directives = this.parseConstDirectives();
       const fields = this.parseInputFieldsDefinition();
       return this.node(start, {
         kind: kinds_ts_1.Kind.INPUT_OBJECT_TYPE_DEFINITION,
         description,
-        name,
+        name: name2,
         directives,
         fields
       });
@@ -13306,14 +13306,14 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       this.expectKeyword("extend");
       this.expectKeyword("scalar");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const directives = this.parseConstDirectives();
       if (directives === undefined) {
         throw this.unexpected();
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.SCALAR_TYPE_EXTENSION,
-        name,
+        name: name2,
         directives
       });
     }
@@ -13321,7 +13321,7 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       this.expectKeyword("extend");
       this.expectKeyword("type");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const interfaces = this.parseImplementsInterfaces();
       const directives = this.parseConstDirectives();
       const fields = this.parseFieldsDefinition();
@@ -13330,7 +13330,7 @@ var require_parser2 = __commonJS((exports) => {
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.OBJECT_TYPE_EXTENSION,
-        name,
+        name: name2,
         interfaces,
         directives,
         fields
@@ -13340,7 +13340,7 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       this.expectKeyword("extend");
       this.expectKeyword("interface");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const interfaces = this.parseImplementsInterfaces();
       const directives = this.parseConstDirectives();
       const fields = this.parseFieldsDefinition();
@@ -13349,7 +13349,7 @@ var require_parser2 = __commonJS((exports) => {
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.INTERFACE_TYPE_EXTENSION,
-        name,
+        name: name2,
         interfaces,
         directives,
         fields
@@ -13359,7 +13359,7 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       this.expectKeyword("extend");
       this.expectKeyword("union");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const directives = this.parseConstDirectives();
       const types = this.parseUnionMemberTypes();
       if (directives === undefined && types === undefined) {
@@ -13367,7 +13367,7 @@ var require_parser2 = __commonJS((exports) => {
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.UNION_TYPE_EXTENSION,
-        name,
+        name: name2,
         directives,
         types
       });
@@ -13376,7 +13376,7 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       this.expectKeyword("extend");
       this.expectKeyword("enum");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const directives = this.parseConstDirectives();
       const values = this.parseEnumValuesDefinition();
       if (directives === undefined && values === undefined) {
@@ -13384,7 +13384,7 @@ var require_parser2 = __commonJS((exports) => {
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.ENUM_TYPE_EXTENSION,
-        name,
+        name: name2,
         directives,
         values
       });
@@ -13393,7 +13393,7 @@ var require_parser2 = __commonJS((exports) => {
       const start = this._lexer.token;
       this.expectKeyword("extend");
       this.expectKeyword("input");
-      const name = this.parseName();
+      const name2 = this.parseName();
       const directives = this.parseConstDirectives();
       const fields = this.parseInputFieldsDefinition();
       if (directives === undefined && fields === undefined) {
@@ -13401,7 +13401,7 @@ var require_parser2 = __commonJS((exports) => {
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.INPUT_OBJECT_TYPE_EXTENSION,
-        name,
+        name: name2,
         directives,
         fields
       });
@@ -13411,14 +13411,14 @@ var require_parser2 = __commonJS((exports) => {
       this.expectKeyword("extend");
       this.expectKeyword("directive");
       this.expectToken(tokenKind_ts_1.TokenKind.AT);
-      const name = this.parseName();
+      const name2 = this.parseName();
       const directives = this.parseConstDirectives();
       if (directives === undefined) {
         throw this.unexpected();
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.DIRECTIVE_EXTENSION,
-        name,
+        name: name2,
         directives
       });
     }
@@ -13427,7 +13427,7 @@ var require_parser2 = __commonJS((exports) => {
       const description = this.parseDescription();
       this.expectKeyword("directive");
       this.expectToken(tokenKind_ts_1.TokenKind.AT);
-      const name = this.parseName();
+      const name2 = this.parseName();
       const args = this.parseArgumentDefs();
       const directives = this.parseConstDirectives();
       const repeatable = this.expectOptionalKeyword("repeatable");
@@ -13436,7 +13436,7 @@ var require_parser2 = __commonJS((exports) => {
       return this.node(start, {
         kind: kinds_ts_1.Kind.DIRECTIVE_DEFINITION,
         description,
-        name,
+        name: name2,
         arguments: args,
         directives,
         repeatable,
@@ -13448,16 +13448,16 @@ var require_parser2 = __commonJS((exports) => {
     }
     parseDirectiveLocation() {
       const start = this._lexer.token;
-      const name = this.parseName();
-      if (Object.hasOwn(directiveLocation_ts_1.DirectiveLocation, name.value)) {
-        return name;
+      const name2 = this.parseName();
+      if (Object.hasOwn(directiveLocation_ts_1.DirectiveLocation, name2.value)) {
+        return name2;
       }
       throw this.unexpected(start);
     }
     parseSchemaCoordinate() {
       const start = this._lexer.token;
       const ofDirective = this.expectOptionalToken(tokenKind_ts_1.TokenKind.AT);
-      const name = this.parseName();
+      const name2 = this.parseName();
       let memberName;
       if (!ofDirective && this.expectOptionalToken(tokenKind_ts_1.TokenKind.DOT)) {
         memberName = this.parseName();
@@ -13472,32 +13472,32 @@ var require_parser2 = __commonJS((exports) => {
         if (argumentName) {
           return this.node(start, {
             kind: kinds_ts_1.Kind.DIRECTIVE_ARGUMENT_COORDINATE,
-            name,
+            name: name2,
             argumentName
           });
         }
         return this.node(start, {
           kind: kinds_ts_1.Kind.DIRECTIVE_COORDINATE,
-          name
+          name: name2
         });
       } else if (memberName) {
         if (argumentName) {
           return this.node(start, {
             kind: kinds_ts_1.Kind.ARGUMENT_COORDINATE,
-            name,
+            name: name2,
             fieldName: memberName,
             argumentName
           });
         }
         return this.node(start, {
           kind: kinds_ts_1.Kind.MEMBER_COORDINATE,
-          name,
+          name: name2,
           memberName
         });
       }
       return this.node(start, {
         kind: kinds_ts_1.Kind.TYPE_COORDINATE,
-        name
+        name: name2
       });
     }
     node(startToken, node2) {
@@ -14414,20 +14414,20 @@ var require_KnownDirectivesRule = __commonJS((exports) => {
     const astDefinitions = context.getDocument().definitions;
     for (const def of astDefinitions) {
       if (def.kind === kinds_ts_1.Kind.DIRECTIVE_DEFINITION) {
-        locationsMap.set(def.name.value, def.locations.map((name) => name.value));
+        locationsMap.set(def.name.value, def.locations.map((name2) => name2.value));
       }
     }
     return {
       Directive(node2, _key, _parent, _path, ancestors) {
-        const name = node2.name.value;
-        const locations = locationsMap.get(name);
+        const name2 = node2.name.value;
+        const locations = locationsMap.get(name2);
         if (locations == null) {
-          context.reportError(new GraphQLError_ts_1.GraphQLError(`Unknown directive "@${name}".`, { nodes: node2 }));
+          context.reportError(new GraphQLError_ts_1.GraphQLError(`Unknown directive "@${name2}".`, { nodes: node2 }));
           return;
         }
         const candidateLocation = getDirectiveLocationForASTPath(ancestors);
         if (candidateLocation != null && !locations.includes(candidateLocation)) {
-          context.reportError(new GraphQLError_ts_1.GraphQLError(`Directive "@${name}" may not be used on ${candidateLocation}.`, { nodes: node2 }));
+          context.reportError(new GraphQLError_ts_1.GraphQLError(`Directive "@${name2}" may not be used on ${candidateLocation}.`, { nodes: node2 }));
         }
       }
     };
@@ -15059,8 +15059,8 @@ var require_OverlappingFieldsCanBeMergedRule = __commonJS((exports) => {
     if (args1.length !== args2.length) {
       return false;
     }
-    const values2 = new Map(args2.map(({ name, value }) => [
-      name.value,
+    const values2 = new Map(args2.map(({ name: name2, value }) => [
+      name2.value,
       varMap2 === undefined ? value : replaceFragmentVariables(value, varMap2)
     ]));
     return args1.every((arg1) => {
@@ -15301,8 +15301,8 @@ var require_PossibleFragmentSpreadsRule = __commonJS((exports) => {
       }
     };
   }
-  function getFragmentType(context, name) {
-    const frag = context.getFragment(name);
+  function getFragmentType(context, name2) {
+    const frag = context.getFragment(name2);
     if (frag) {
       const type = (0, typeFromAST_ts_1.typeFromAST)(context.getSchema(), frag.typeCondition);
       if ((0, definition_ts_1.isCompositeType)(type)) {
@@ -15840,11 +15840,11 @@ var require_values = __commonJS((exports) => {
     }
     return { sources, coerced };
   }
-  function maybeUseDefaultValue(coercedValues, name, inputValue, onError, hideSuggestions) {
+  function maybeUseDefaultValue(coercedValues, name2, inputValue, onError, hideSuggestions) {
     try {
       const coercedDefaultValue = (0, coerceInputValue_ts_1.coerceDefaultValue)(inputValue);
       if (coercedDefaultValue !== undefined) {
-        coercedValues[name] = coercedDefaultValue;
+        coercedValues[name2] = coercedDefaultValue;
       }
     } catch (error62) {
       const defaultInput = inputValue.default;
@@ -15888,8 +15888,8 @@ var require_values = __commonJS((exports) => {
     const argumentNodes = node2.arguments ?? [];
     const argNodeMap = new Map(argumentNodes.map((arg) => [arg.name.value, arg]));
     for (const argDef of def.args) {
-      const name = argDef.name;
-      coerceArgument(coercedValues, node2, name, argDef, argNodeMap.get(argDef.name), variableValues, fragmentVariableValues, hideSuggestions);
+      const name2 = argDef.name;
+      coerceArgument(coercedValues, node2, name2, argDef, argNodeMap.get(argDef.name), variableValues, fragmentVariableValues, hideSuggestions);
     }
     return coercedValues;
   }
@@ -16840,7 +16840,7 @@ var require_ValidationContext = __commonJS((exports) => {
     getDocument() {
       return this._ast;
     }
-    getFragment(name) {
+    getFragment(name2) {
       let fragments;
       if (this._fragments) {
         fragments = this._fragments;
@@ -16853,7 +16853,7 @@ var require_ValidationContext = __commonJS((exports) => {
         }
         this._fragments = fragments;
       }
-      return fragments[name];
+      return fragments[name2];
     }
     getFragmentSpreads(node2) {
       let spreads = this._fragmentSpreads.get(node2);
@@ -21774,10 +21774,10 @@ var require_extendSchema = __commonJS((exports) => {
         return opTypes;
       }
       function namedTypeFromAST(node2) {
-        const name = node2.name.value;
-        const type = getNamedType(name);
+        const name2 = node2.name.value;
+        const type = getNamedType(name2);
         if (!(type !== undefined))
-          (0, invariant_ts_1.invariant)(false, `Unknown type: "${name}".`);
+          (0, invariant_ts_1.invariant)(false, `Unknown type: "${name2}".`);
         return type;
       }
       function typeFromAST(node2) {
@@ -21884,13 +21884,13 @@ var require_extendSchema = __commonJS((exports) => {
         return nodes.flatMap((node2) => node2.types?.map(namedTypeFromAST) ?? []);
       }
       function buildNamedType(astNode) {
-        const name = astNode.name.value;
+        const name2 = astNode.name.value;
         switch (astNode.kind) {
           case kinds_ts_1.Kind.OBJECT_TYPE_DEFINITION: {
-            const extensionASTNodes = objectExtensions.get(name) ?? [];
+            const extensionASTNodes = objectExtensions.get(name2) ?? [];
             const allNodes = [astNode, ...extensionASTNodes];
             return new definition_ts_1.GraphQLObjectType({
-              name,
+              name: name2,
               description: astNode.description?.value,
               interfaces: () => buildInterfaces(allNodes),
               fields: () => buildFieldMap(allNodes),
@@ -21899,10 +21899,10 @@ var require_extendSchema = __commonJS((exports) => {
             });
           }
           case kinds_ts_1.Kind.INTERFACE_TYPE_DEFINITION: {
-            const extensionASTNodes = interfaceExtensions.get(name) ?? [];
+            const extensionASTNodes = interfaceExtensions.get(name2) ?? [];
             const allNodes = [astNode, ...extensionASTNodes];
             return new definition_ts_1.GraphQLInterfaceType({
-              name,
+              name: name2,
               description: astNode.description?.value,
               interfaces: () => buildInterfaces(allNodes),
               fields: () => buildFieldMap(allNodes),
@@ -21911,10 +21911,10 @@ var require_extendSchema = __commonJS((exports) => {
             });
           }
           case kinds_ts_1.Kind.ENUM_TYPE_DEFINITION: {
-            const extensionASTNodes = enumExtensions.get(name) ?? [];
+            const extensionASTNodes = enumExtensions.get(name2) ?? [];
             const allNodes = [astNode, ...extensionASTNodes];
             return new definition_ts_1.GraphQLEnumType({
-              name,
+              name: name2,
               description: astNode.description?.value,
               values: () => buildEnumValueMap(allNodes),
               astNode,
@@ -21922,10 +21922,10 @@ var require_extendSchema = __commonJS((exports) => {
             });
           }
           case kinds_ts_1.Kind.UNION_TYPE_DEFINITION: {
-            const extensionASTNodes = unionExtensions.get(name) ?? [];
+            const extensionASTNodes = unionExtensions.get(name2) ?? [];
             const allNodes = [astNode, ...extensionASTNodes];
             return new definition_ts_1.GraphQLUnionType({
-              name,
+              name: name2,
               description: astNode.description?.value,
               types: () => buildUnionTypes(allNodes),
               astNode,
@@ -21933,13 +21933,13 @@ var require_extendSchema = __commonJS((exports) => {
             });
           }
           case kinds_ts_1.Kind.SCALAR_TYPE_DEFINITION: {
-            const extensionASTNodes = scalarExtensions.get(name) ?? [];
+            const extensionASTNodes = scalarExtensions.get(name2) ?? [];
             let specifiedByURL = getSpecifiedByURL(astNode);
             for (const extensionNode of extensionASTNodes) {
               specifiedByURL = getSpecifiedByURL(extensionNode) ?? specifiedByURL;
             }
             return new definition_ts_1.GraphQLScalarType({
-              name,
+              name: name2,
               description: astNode.description?.value,
               specifiedByURL,
               astNode,
@@ -21947,10 +21947,10 @@ var require_extendSchema = __commonJS((exports) => {
             });
           }
           case kinds_ts_1.Kind.INPUT_OBJECT_TYPE_DEFINITION: {
-            const extensionASTNodes = inputObjectExtensions.get(name) ?? [];
+            const extensionASTNodes = inputObjectExtensions.get(name2) ?? [];
             const allNodes = [astNode, ...extensionASTNodes];
             return new definition_ts_1.GraphQLInputObjectType({
-              name,
+              name: name2,
               description: astNode.description?.value,
               fields: () => buildInputFieldMap(allNodes),
               astNode,
@@ -22993,8 +22993,8 @@ var require_findSchemaChanges = __commonJS((exports) => {
     const added = [];
     const removed = [];
     const persisted = [];
-    const oldMap = (0, keyMap_ts_1.keyMap)(oldArray, ({ name }) => name);
-    const newMap = (0, keyMap_ts_1.keyMap)(newArray, ({ name }) => name);
+    const oldMap = (0, keyMap_ts_1.keyMap)(oldArray, ({ name: name2 }) => name2);
+    const newMap = (0, keyMap_ts_1.keyMap)(newArray, ({ name: name2 }) => name2);
     for (const oldItem of oldArray) {
       const newItem = newMap[oldItem.name];
       if (newItem === undefined) {
@@ -24030,8 +24030,10 @@ var require___dev__ = __commonJS((exports, module) => {
   enableDevMode();
   module.exports = require_graphql2();
 });
+
 // package.json
-var version = "0.3.1";
+var name = "@abyssinia-labs/sokie";
+var version = "0.4.0";
 var sokie = {
   site: "https://sokie.sh"
 };
@@ -24055,7 +24057,7 @@ function parseCommandArgs(argv, options) {
   }
 }
 async function fail(out, code, message, exit) {
-  await out.problem(`✗ ${message}`);
+  await out.problem(`✗ ${message}`, "fail");
   await out.result({ ok: false, error: { code, message } });
   return exit;
 }
@@ -24066,6 +24068,9 @@ function splitGlobalFlags(argv) {
   return { json: head.includes("--json"), rest: [...head.filter((a) => a !== "--json"), ...tail] };
 }
 
+// src/tint.ts
+var plain = (_tone, text) => text;
+
 // src/logs.ts
 var OUTCOME = {
   ok: "ok",
@@ -24075,26 +24080,40 @@ var OUTCOME = {
   rateLimited: "rate limited",
   failed: "failed"
 };
+var OUTCOME_TONE = {
+  ok: "ok",
+  toolError: "fail",
+  refused: "warn",
+  paused: "warn",
+  rateLimited: "warn",
+  failed: "fail"
+};
+var OUTCOME_WIDTH = 12;
 var two = (n) => String(n).padStart(2, "0");
 function stamp(at) {
   const d = new Date(at);
   return `${d.getFullYear()}-${two(d.getMonth() + 1)}-${two(d.getDate())} ${two(d.getHours())}:${two(d.getMinutes())}:${two(d.getSeconds())}`;
 }
-function logLine(entry) {
+function logLine(entry, tint = plain) {
   const error = [entry.errorClass, entry.upstreamStatus].filter((part) => part !== undefined);
   const extra = [
     error.length > 0 ? error.join(" ") : null,
     entry.client ?? null,
     entry.preview !== undefined ? `preview #${entry.preview}` : null
   ].filter((part) => part !== null);
-  return [
+  const tone = OUTCOME_TONE[entry.outcome];
+  const failed = tone === "fail";
+  const outcome = OUTCOME[entry.outcome];
+  const cell = `${failed ? outcome : tint(tone, outcome)}${" ".repeat(OUTCOME_WIDTH - outcome.length)}`;
+  const line = [
     stamp(entry.at),
-    OUTCOME[entry.outcome].padEnd(12),
+    cell,
     String(entry.status).padStart(3),
     `${entry.durationMs}ms`.padStart(7),
     ` ${(entry.tool ?? entry.method ?? "-").padEnd(24)}`,
     extra.join("  ")
   ].join("  ").trimEnd();
+  return failed ? tint("fail", line) : line;
 }
 function liveLine(deployment) {
   if (deployment.number === undefined)
@@ -24571,14 +24590,14 @@ function getFunctionName(functionReference) {
   }
   if (typeof functionReference === "string")
     return functionReference;
-  const name = functionReference[functionName];
-  if (!name) {
+  const name2 = functionReference[functionName];
+  if (!name2) {
     throw new Error(`${functionReference} is not a functionReference`);
   }
-  return name;
+  return name2;
 }
-function makeFunctionReference(name) {
-  return { [functionName]: name };
+function makeFunctionReference(name2) {
+  return { [functionName]: name2 };
 }
 function createApi(pathParts = []) {
   const handler = {
@@ -24620,9 +24639,9 @@ var AUDIT_CATEGORIES = [
   "workspace",
   "billing"
 ];
-var query = (name) => makeFunctionReference(name);
-var mutation = (name) => makeFunctionReference(name);
-var action = (name) => makeFunctionReference(name);
+var query = (name2) => makeFunctionReference(name2);
+var mutation = (name2) => makeFunctionReference(name2);
+var action = (name2) => makeFunctionReference(name2);
 var fn = {
   me: query("account:me"),
   serverBySlug: query("servers:bySlug"),
@@ -24630,6 +24649,13 @@ var fn = {
   sourceUploadUrl: mutation("deployments:sourceUploadUrl"),
   startDeploy: mutation("deployments:start"),
   deployment: query("deployments:get"),
+  deployments: query("deployments:forServer"),
+  deployByNumber: query("deployDiffs:byNumber"),
+  server: query("servers:get"),
+  serverFiles: query("serverFiles:download"),
+  restoreCheck: query("restores:check"),
+  restore: mutation("restores:start"),
+  resume: mutation("restores:resume"),
   keyServer: query("deployKeys:keyServer"),
   secrets: query("secrets:list"),
   logs: query("callLogs:recent"),
@@ -24651,8 +24677,8 @@ var fn = {
 
 // src/audit.ts
 var TYPE_NAMES = AUDIT_CATEGORIES.map((category) => category.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`));
-function auditType(name) {
-  const index = TYPE_NAMES.indexOf(name.trim().toLowerCase());
+function auditType(name2) {
+  const index = TYPE_NAMES.indexOf(name2.trim().toLowerCase());
   return index === -1 ? null : AUDIT_CATEGORIES[index] ?? null;
 }
 function auditActor(actor) {
@@ -24662,9 +24688,9 @@ function auditActor(actor) {
     return `deploy key ${actor.name}`;
   return actor.name;
 }
-function auditLine(entry) {
+function auditLine(entry, tint = plain) {
   const where = entry.network?.ip ? `  ${entry.network.ip}` : "";
-  return `${stamp(entry.at)}  ${entry.summary}  · ${auditActor(entry.actor)}${where}`;
+  return `${stamp(entry.at)}  ${entry.summary}  ${tint("dim", `· ${auditActor(entry.actor)}${where}`)}`;
 }
 
 // ../../node_modules/yaml/dist/index.js
@@ -24863,14 +24889,14 @@ for (const word of "send email mail notify invite publish charge pay refund tran
 }
 var SEVERITY = { read: 0, write: 1, delete: 2, external_effect: 3 };
 var BOUNDING = /^(limit|max(_?results)?|per_?page|page_?size|size|count|top|first|last|take|skip|offset|page|page_?token|next_?token|cursor|after|before|starting_?after|ending_?before)$/i;
-function words(name) {
-  return name.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/[^A-Za-z0-9]+/).filter(Boolean).map((word) => word.toLowerCase());
+function words(name2) {
+  return name2.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/[^A-Za-z0-9]+/).filter(Boolean).map((word) => word.toLowerCase());
 }
 function singular(word) {
   return word.length > 3 && word.endsWith("s") && !word.endsWith("ss") ? word.slice(0, -1) : word;
 }
-function nameKey(name) {
-  return words(name).map(singular).join(" ");
+function nameKey(name2) {
+  return words(name2).map(singular).join(" ");
 }
 function finding(rule, file, problem) {
   const { level, fix } = USABILITY_RULES[rule];
@@ -24943,9 +24969,9 @@ function stemOf(path, dir) {
 }
 function caseCollisions(names) {
   const groups = new Map;
-  for (const name of names) {
-    const key = name.toLowerCase();
-    groups.set(key, [...groups.get(key) ?? [], name]);
+  for (const name2 of names) {
+    const key = name2.toLowerCase();
+    groups.set(key, [...groups.get(key) ?? [], name2]);
   }
   return [...groups.values()].filter((group) => group.length > 1);
 }
@@ -24962,11 +24988,11 @@ function defaultToolNames(index) {
     if (op.excluded)
       continue;
     const base = defaultToolName(op);
-    let name = base;
-    for (let n = 2;taken.has(name.toLowerCase()); n++)
-      name = `${base.slice(0, 60)}${n}`;
-    taken.add(name.toLowerCase());
-    names.set(op.key, name);
+    let name2 = base;
+    for (let n = 2;taken.has(name2.toLowerCase()); n++)
+      name2 = `${base.slice(0, 60)}${n}`;
+    taken.add(name2.toLowerCase());
+    names.set(op.key, name2);
   }
   return names;
 }
@@ -26053,12 +26079,12 @@ function merge(a, b) {
   });
   return clone(a, def);
 }
-function partial(Class, schema, mask, name = "partial") {
+function partial(Class, schema, mask, name2 = "partial") {
   const currDef = schema._zod.def;
   const checks = currDef.checks;
   const hasChecks = checks && checks.length > 0;
   if (hasChecks) {
-    throw new Error(`.${name}() cannot be used on object schemas containing refinements`);
+    throw new Error(`.${name2}() cannot be used on object schemas containing refinements`);
   }
   const def = mergeDefs(schema._zod.def, {
     get shape() {
@@ -26411,7 +26437,7 @@ function newError(Definition) {
   }
   return new Definition;
 }
-function $constructor(name, initializer, proto, params) {
+function $constructor(name2, initializer, proto, params) {
   const zodProto = {};
   function Internals(def) {
     this.def = def;
@@ -26430,10 +26456,10 @@ function $constructor(name, initializer, proto, params) {
         _zodDesc.value = undefined;
       }
     }
-    if (inst._zod.traits.has(name)) {
+    if (inst._zod.traits.has(name2)) {
       return;
     }
-    inst._zod.traits.add(name);
+    inst._zod.traits.add(name2);
     initializer(inst, def);
     if (initialized) {
       const own2 = Object.getPrototypeOf(inst);
@@ -26460,7 +26486,7 @@ function $constructor(name, initializer, proto, params) {
 
   class Definition extends Parent {
   }
-  Object.defineProperty(Definition, "name", { value: name });
+  Object.defineProperty(Definition, "name", { value: name2 });
   function _(def) {
     const inst = params?.Parent ? newError(Definition) : this;
     init(inst, def);
@@ -26481,10 +26507,10 @@ function $constructor(name, initializer, proto, params) {
     value: (inst) => {
       if (params?.Parent && inst instanceof params.Parent)
         return true;
-      return inst?._zod?.traits?.has(name);
+      return inst?._zod?.traits?.has(name2);
     }
   });
-  Object.defineProperty(_, "name", { value: name });
+  Object.defineProperty(_, "name", { value: name2 });
   return _;
 }
 var $brand = /* @__PURE__ */ Symbol("zod_brand");
@@ -26496,8 +26522,8 @@ class $ZodAsyncError extends Error {
 }
 
 class $ZodEncodeError extends Error {
-  constructor(name) {
-    super(`Encountered unidirectional transform during encode: ${name}`);
+  constructor(name2) {
+    super(`Encountered unidirectional transform during encode: ${name2}`);
     this.name = "ZodEncodeError";
   }
 }
@@ -37521,13 +37547,13 @@ ${code2}
   return fn2;
 }
 function addConstant(ctx, value) {
-  for (const [name2, v] of ctx.constants) {
+  for (const [name3, v] of ctx.constants) {
     if (v === value)
-      return name2;
+      return name3;
   }
-  const name = `c${ctx.constantCounter++}`;
-  ctx.constants.set(name, value);
-  return name;
+  const name2 = `c${ctx.constantCounter++}`;
+  ctx.constants.set(name2, value);
+  return name2;
 }
 function newVar(ctx) {
   return `v${ctx.varCounter++}`;
@@ -43610,9 +43636,9 @@ var resourceFrontmatter = exports_external.strictObject({
 function templatePlaceholders(template) {
   const names = new Set;
   for (const match of template.matchAll(/\{\{\s*([A-Za-z_][A-Za-z0-9_]*)\s*\}\}/g)) {
-    const name = match[1];
-    if (name)
-      names.add(name);
+    const name2 = match[1];
+    if (name2)
+      names.add(name2);
   }
   return [...names];
 }
@@ -43751,10 +43777,10 @@ function declaredBaseUrl(doc2, sourceUrl) {
   if (!isRecord2(server) || !url2)
     return null;
   if (isRecord2(server.variables)) {
-    for (const [name, variable] of Object.entries(server.variables)) {
+    for (const [name2, variable] of Object.entries(server.variables)) {
       const fallback = isRecord2(variable) ? text(variable.default) : null;
       if (fallback)
-        url2 = url2.replaceAll(`{${name}}`, fallback);
+        url2 = url2.replaceAll(`{${name2}}`, fallback);
     }
   }
   if (/^[a-z][a-z0-9+.-]*:\/\//i.test(url2) || !sourceUrl)
@@ -43792,8 +43818,8 @@ function schemaIsList(doc2, raw) {
   if (schema.type === "array")
     return true;
   const properties = isRecord3(schema.properties) ? schema.properties : {};
-  return LIST_ENVELOPES.some((name) => {
-    const property = deref(doc2, properties[name]);
+  return LIST_ENVELOPES.some((name2) => {
+    const property = deref(doc2, properties[name2]);
     return isRecord3(property) && property.type === "array";
   });
 }
@@ -44018,7 +44044,7 @@ function newToolRisk(op) {
 var SERVER_SCHEMA_VERSION = 1;
 var SERVER_CONFIG_FILE = "sokie.json";
 var SERVER_SCHEMA_URL = "https://sokie.sh/schema/server.v1.json";
-var secretName = exports_external.string().regex(SECRET_NAME, "Secret names are UPPER_SNAKE_CASE").refine((name) => !name.startsWith("SOKIE_"), "Names starting with SOKIE_ are reserved for the platform");
+var secretName = exports_external.string().regex(SECRET_NAME, "Secret names are UPPER_SNAKE_CASE").refine((name2) => !name2.startsWith("SOKIE_"), "Names starting with SOKIE_ are reserved for the platform");
 var secretRef = exports_external.strictObject({ secret: secretName });
 var httpsUrl = exports_external.url({ protocol: /^https?$/, error: "Must be an http(s) URL" });
 var sourceConfig = exports_external.strictObject({
@@ -44139,17 +44165,17 @@ function planInit(input2) {
   const toolFor = new Map;
   const names = namesFor(facts.operations);
   for (const op of included) {
-    const name = names.get(op.key);
-    if (!name)
+    const name2 = names.get(op.key);
+    if (!name2)
       continue;
     const text2 = toolText(op, input2.choices?.get(op.key));
     if (typeof text2 !== "string") {
-      problems.push(`${name}: ${text2.problem}`);
+      problems.push(`${name2}: ${text2.problem}`);
       continue;
     }
-    files.set(`tools/${name}.md`, text2);
-    tools.push(name);
-    toolFor.set(op.key, name);
+    files.set(`tools/${name2}.md`, text2);
+    tools.push(name2);
+    toolFor.set(op.key, name2);
   }
   const left = facts.operations.length - included.length;
   if (left > 0) {
@@ -44184,8 +44210,8 @@ function sendable(scheme) {
 function chosenScheme(doc2) {
   const schemes = schemesOf(doc2);
   const applied = Array.isArray(doc2.security) && isRecord5(doc2.security[0]) ? doc2.security[0] : {};
-  const name = Object.keys(applied)[0] ?? Object.keys(schemes).find((key) => sendable(schemes[key])) ?? Object.keys(schemes)[0];
-  const scheme = name ? schemes[name] : undefined;
+  const name2 = Object.keys(applied)[0] ?? Object.keys(schemes).find((key) => sendable(schemes[key])) ?? Object.keys(schemes)[0];
+  const scheme = name2 ? schemes[name2] : undefined;
   return isRecord5(scheme) ? scheme : null;
 }
 function upstreamAuthFor(doc2) {
@@ -44194,9 +44220,9 @@ function upstreamAuthFor(doc2) {
     return { auth: null, note: null };
   const type = text2(scheme.type)?.toLowerCase();
   const where = text2(scheme.in);
-  const name = text2(scheme.name);
-  if (type === "apikey" && (where === "header" || where === "query") && name) {
-    return { auth: { type: "apiKey", in: where, name, key: "perCaller" }, note: null };
+  const name2 = text2(scheme.name);
+  if (type === "apikey" && (where === "header" || where === "query") && name2) {
+    return { auth: { type: "apiKey", in: where, name: name2, key: "perCaller" }, note: null };
   }
   if (type === "http" && text2(scheme.scheme)?.toLowerCase() === "bearer") {
     return {
@@ -44510,13 +44536,13 @@ function loadCases(files, findings) {
   for (const [file2, content] of files) {
     if (!file2.startsWith(`${TESTS_DIR}/`))
       continue;
-    const name = caseStem(file2);
-    if (name === null) {
+    const name2 = caseStem(file2);
+    if (name2 === null) {
       findings.push(warning(file2, "stray-file", "Only `tests/<name>.json` files are read; this one is ignored."));
       continue;
     }
-    if (!TOOL_NAME.test(name)) {
-      findings.push(error(file2, "invalid-name", `"${name}" is not a valid case name: start with a letter, then letters, digits, _ or -, 64 at most.`));
+    if (!TOOL_NAME.test(name2)) {
+      findings.push(error(file2, "invalid-name", `"${name2}" is not a valid case name: start with a letter, then letters, digits, _ or -, 64 at most.`));
       continue;
     }
     let raw;
@@ -44532,7 +44558,7 @@ function loadCases(files, findings) {
       findings.push(...issuesToFindings(file2, parsed.error.issues));
       continue;
     }
-    cases.push({ name, file: file2, data: parsed.data });
+    cases.push({ name: name2, file: file2, data: parsed.data });
   }
   for (const group of caseCollisions(cases.map((item) => item.name))) {
     findings.push(error(TESTS_DIR, "case-collision", `${group.join(" and ")} differ only in case; macOS and Windows checkouts keep one of them.`));
@@ -44542,16 +44568,16 @@ function loadCases(files, findings) {
 function defaultTargets(tool) {
   return tool.enforcedRisk === "read" ? ["dev", "preview", "production"] : ["dev", "preview"];
 }
-function unknownToolMessage(name, tools) {
-  const lower = name.toLowerCase();
+function unknownToolMessage(name2, tools) {
+  const lower = name2.toLowerCase();
   const near = tools.find((tool) => tool.name.toLowerCase() === lower || tool.name.toLowerCase().startsWith(lower) || lower.startsWith(tool.name.toLowerCase()));
   const hint = near ? ` Did you mean ${near.name}?` : "";
-  return `No tool named ${name} in tools/.${hint} Point the case at a tool's file name, or add the tool.`;
+  return `No tool named ${name2} in tools/.${hint} Point the case at a tool's file name, or add the tool.`;
 }
 function checkCases(loaded, tools, toolFiles, findings) {
   const byName2 = new Map(tools.map((tool) => [tool.name, tool]));
   const cases = [];
-  for (const { name, file: file2, data } of loaded) {
+  for (const { name: name2, file: file2, data } of loaded) {
     const tool = byName2.get(data.tool);
     if (!tool) {
       if (toolFiles.has(data.tool))
@@ -44561,7 +44587,7 @@ function checkCases(loaded, tools, toolFiles, findings) {
     }
     const on = data.on ? [...new Set(data.on)] : defaultTargets(tool);
     cases.push({
-      name,
+      name: name2,
       file: file2,
       ...data.description ? { description: data.description } : {},
       tool: tool.name,
@@ -44577,7 +44603,7 @@ var UNEXPOSED_SAMPLE = 5;
 function checkTools(tools, config2, index, findings) {
   const resolved = [];
   const boundBy = new Map;
-  for (const { name, file: file2, data, body } of tools) {
+  for (const { name: name2, file: file2, data, body } of tools) {
     const key = normaliseOperation(data.operation);
     const operation = index.operations.get(key);
     if (!operation) {
@@ -44602,7 +44628,7 @@ function checkTools(tools, config2, index, findings) {
       findings.push(error(file2, "auth-without-oauth", `\`auth: ${data.auth}\` only means something when \`upstream.auth\` is OAuth.`));
     }
     resolved.push({
-      name,
+      name: name2,
       file: file2,
       operation: key,
       title: data.title,
@@ -44642,13 +44668,13 @@ function loadDir(files, dir, schema, findings) {
   for (const [file2, content] of files) {
     if (!file2.startsWith(`${dir}/`))
       continue;
-    const name = stemOf(file2, dir);
-    if (name === null) {
+    const name2 = stemOf(file2, dir);
+    if (name2 === null) {
       findings.push(warning(file2, "stray-file", `Only \`${dir}/<name>.md\` files are read; this one is ignored.`));
       continue;
     }
-    if (!TOOL_NAME.test(name)) {
-      findings.push(error(file2, "invalid-name", `"${name}" is not a valid name: start with a letter, then letters, digits, _ or -, 64 at most.`));
+    if (!TOOL_NAME.test(name2)) {
+      findings.push(error(file2, "invalid-name", `"${name2}" is not a valid name: start with a letter, then letters, digits, _ or -, 64 at most.`));
       continue;
     }
     const split = splitFrontmatter(content);
@@ -44662,7 +44688,7 @@ function loadDir(files, dir, schema, findings) {
       findings.push(...issuesToFindings(file2, parsed.error.issues));
       continue;
     }
-    items.push({ name, file: file2, data: parsed.data, body: split.file.body });
+    items.push({ name: name2, file: file2, data: parsed.data, body: split.file.body });
   }
   for (const group of caseCollisions(items.map((item) => item.name))) {
     findings.push(error(dir, "case-collision", `${group.join(" and ")} differ only in case; macOS and Windows checkouts keep one of them.`));
@@ -44680,7 +44706,7 @@ function loadTools(files, findings) {
 }
 function loadPrompts(files, findings) {
   const prompts = loadDir(files, "prompts", promptFrontmatter, findings);
-  return prompts.map(({ name, file: file2, data, body }) => {
+  return prompts.map(({ name: name2, file: file2, data, body }) => {
     const declared = new Set((data.arguments ?? []).map((arg) => arg.name));
     const used = new Set(templatePlaceholders(body));
     for (const placeholder of used) {
@@ -44695,7 +44721,7 @@ function loadPrompts(files, findings) {
     if (body === "")
       findings.push(error(file2, "missing-template", "The body is the prompt's template; it is empty."));
     return {
-      name,
+      name: name2,
       file: file2,
       title: data.title,
       description: data.description,
@@ -44714,8 +44740,8 @@ function loadResources(files, findings) {
     }
     seen.set(resource.data.uri, resource.file);
   }
-  return resources.map(({ name, file: file2, data, body }) => ({
-    name,
+  return resources.map(({ name: name2, file: file2, data, body }) => ({
+    name: name2,
     file: file2,
     uri: data.uri,
     title: data.title,
@@ -44735,14 +44761,14 @@ function unexposedOperations(index, tools) {
     if (op.excluded || bound.has(op.key))
       continue;
     const base = names.get(op.key) ?? op.key;
-    let name = base;
-    for (let n = 2;taken.has(name.toLowerCase()); n++)
-      name = `${base.slice(0, 60)}${n}`;
-    taken.add(name.toLowerCase());
+    let name2 = base;
+    for (let n = 2;taken.has(name2.toLowerCase()); n++)
+      name2 = `${base.slice(0, 60)}${n}`;
+    taken.add(name2.toLowerCase());
     unexposed.push({
       operation: op.key,
       specName: op.specName,
-      name,
+      name: name2,
       floor: op.floor,
       summary: op.summary,
       description: op.description
@@ -44800,15 +44826,15 @@ function loadSource(files, config2, findings) {
 function checkSecrets(config2, findings) {
   const declared = new Set(Object.keys(config2.secrets));
   const used = new Set;
-  for (const { name, at } of secretRefsIn(config2)) {
-    used.add(name);
-    if (!declared.has(name)) {
-      findings.push(error("sokie.json", "undeclared-secret", `${at} refers to the secret ${name}, which is not declared under \`secrets\`.`));
+  for (const { name: name2, at } of secretRefsIn(config2)) {
+    used.add(name2);
+    if (!declared.has(name2)) {
+      findings.push(error("sokie.json", "undeclared-secret", `${at} refers to the secret ${name2}, which is not declared under \`secrets\`.`));
     }
   }
-  for (const name of declared) {
-    if (!used.has(name))
-      findings.push(warning("sokie.json", "unused-secret", `The secret ${name} is declared but nothing refers to it.`));
+  for (const name2 of declared) {
+    if (!used.has(name2))
+      findings.push(warning("sokie.json", "unused-secret", `The secret ${name2} is declared but nothing refers to it.`));
   }
 }
 function checkBaseUrl(config2, index, findings) {
@@ -44909,6 +44935,12 @@ function refusal(error62) {
   if (error62 instanceof ConvexError && error62.data === "DEPLOY_IN_PROGRESS") {
     throw new DeployError("deploy_in_progress", IN_PROGRESS_MESSAGE);
   }
+  const data = error62 instanceof ConvexError ? error62.data : null;
+  if (typeof data === "object" && data !== null && "code" in data && data.code === "STALE_BASE") {
+    const live = "live" in data ? String(data.live) : "?";
+    const base = "base" in data ? String(data.base) : "?";
+    throw new DeployError("stale_base", `Production is #${live} now, but these files came from #${base}, so deploying them would undo what changed since. Run sokie pull to bring them up to date, or sokie deploy --force to deploy these as they are.`);
+  }
   throw error62;
 }
 function sourceArchive(files) {
@@ -44930,7 +44962,14 @@ async function serverBySlug(platform, slug) {
 async function deployArchive(platform, serverId, archive, options) {
   const { key, url: url2 } = await platform.mutation(fn.sourceUploadUrl, { serverId }).catch(refusal);
   await platform.upload(url2, archive);
-  const deploymentId = await platform.mutation(fn.startDeploy, { serverId, sourceKey: key }).catch(refusal);
+  const deploymentId = await platform.mutation(fn.startDeploy, {
+    serverId,
+    sourceKey: key,
+    ...options.base === undefined ? {} : { base: options.base }
+  }).catch(refusal);
+  return await followDeploy(platform, deploymentId, options);
+}
+async function followDeploy(platform, deploymentId, options) {
   let last = null;
   const deadline = Date.now() + WAIT_MS;
   for (;; ) {
@@ -44979,11 +45018,11 @@ async function refused(response) {
   const description = typeof body.error_description === "string" ? body.error_description : response.statusText;
   return new OAuthError(code2, description);
 }
-async function registerClient(info2, name, fetchFn = fetch) {
+async function registerClient(info2, name2, fetchFn = fetch) {
   const response = await fetchFn(info2.registrationEndpoint, {
     method: "POST",
     headers: { "content-type": "application/json" },
-    body: JSON.stringify({ client_name: name, redirect_uris: [REGISTERED_REDIRECT] })
+    body: JSON.stringify({ client_name: name2, redirect_uris: [REGISTERED_REDIRECT] })
   });
   if (!response.ok)
     throw await refused(response);
@@ -45322,7 +45361,7 @@ class ConvexHttpClient {
     return await this.queryInner(query2, queryArgs, {});
   }
   async queryInner(query2, queryArgs, options) {
-    const name = getFunctionName(query2);
+    const name2 = getFunctionName(query2);
     const args = [convexToJson(queryArgs)];
     const headers = {
       "Content-Type": "application/json",
@@ -45336,7 +45375,7 @@ class ConvexHttpClient {
     const localFetch = this.fetch || specifiedFetch || fetch;
     const timestamp = options.timestampPromise ? await options.timestampPromise : undefined;
     const body = JSON.stringify({
-      path: name,
+      path: name2,
       format: "convex_encoded_json",
       args,
       ...timestamp ? { ts: timestamp } : {}
@@ -45354,7 +45393,7 @@ class ConvexHttpClient {
     const respJSON = await response.json();
     if (this.debug) {
       for (const line of respJSON.logLines ?? []) {
-        logForFunction(this.logger, "info", "query", name, line);
+        logForFunction(this.logger, "info", "query", name2, line);
       }
     }
     switch (respJSON.status) {
@@ -45370,9 +45409,9 @@ class ConvexHttpClient {
     }
   }
   async mutationInner(mutation2, mutationArgs) {
-    const name = getFunctionName(mutation2);
+    const name2 = getFunctionName(mutation2);
     const body = JSON.stringify({
-      path: name,
+      path: name2,
       format: "convex_encoded_json",
       args: [convexToJson(mutationArgs)]
     });
@@ -45398,7 +45437,7 @@ class ConvexHttpClient {
     const respJSON = await response.json();
     if (this.debug) {
       for (const line of respJSON.logLines ?? []) {
-        logForFunction(this.logger, "info", "mutation", name, line);
+        logForFunction(this.logger, "info", "mutation", name2, line);
       }
     }
     switch (respJSON.status) {
@@ -45447,9 +45486,9 @@ class ConvexHttpClient {
   }
   async action(action2, ...args) {
     const actionArgs = parseArgs2(args[0]);
-    const name = getFunctionName(action2);
+    const name2 = getFunctionName(action2);
     const body = JSON.stringify({
-      path: name,
+      path: name2,
       format: "convex_encoded_json",
       args: [convexToJson(actionArgs)]
     });
@@ -45475,7 +45514,7 @@ class ConvexHttpClient {
     const respJSON = await response.json();
     if (this.debug) {
       for (const line of respJSON.logLines ?? []) {
-        logForFunction(this.logger, "info", "action", name, line);
+        logForFunction(this.logger, "info", "action", name2, line);
       }
     }
     switch (respJSON.status) {
@@ -45492,10 +45531,10 @@ class ConvexHttpClient {
   }
   async function(anyFunction, componentPath, ...args) {
     const functionArgs = parseArgs2(args[0]);
-    const name = typeof anyFunction === "string" ? anyFunction : getFunctionName(anyFunction);
+    const name2 = typeof anyFunction === "string" ? anyFunction : getFunctionName(anyFunction);
     const body = JSON.stringify({
       componentPath,
-      path: name,
+      path: name2,
       format: "convex_encoded_json",
       args: convexToJson(functionArgs)
     });
@@ -45521,7 +45560,7 @@ class ConvexHttpClient {
     const respJSON = await response.json();
     if (this.debug) {
       for (const line of respJSON.logLines ?? []) {
-        logForFunction(this.logger, "info", "any", name, line);
+        logForFunction(this.logger, "info", "any", name2, line);
       }
     }
     switch (respJSON.status) {
@@ -45600,8 +45639,14 @@ function fileStore(path = join2(configDir(), "notices.json")) {
 }
 var billingUrl = (site) => `${site.replace(/\/+$/, "")}/billing`;
 function noticeLines(notice, site) {
-  const mark = notice.level === "stopped" ? "✗" : "!";
-  return [`${mark} ${notice.title}. ${notice.body}`, `  Billing: ${billingUrl(site)}`];
+  const stopped = notice.level === "stopped";
+  return [
+    {
+      text: `${stopped ? "✗" : "!"} ${notice.title}. ${notice.body}`,
+      tone: stopped ? "fail" : "warn"
+    },
+    { text: `  Billing: ${billingUrl(site)}`, tone: "dim" }
+  ];
 }
 function shownKey(notice, site) {
   return `${site} ${notice.level}:${notice.of}`;
@@ -45620,7 +45665,7 @@ async function maybeNotice(out, client, site, now = Date.now(), store = fileStor
     if (now - (shown[key] ?? 0) < DAY_MS)
       return;
     for (const line of noticeLines(notice, site))
-      await out.problem(line);
+      await out.problem(line.text, line.tone);
     store.write({ ...shown, [key]: now });
   } catch {}
 }
@@ -45689,7 +45734,7 @@ async function run(argv, out) {
         cursor = result.continueCursor;
       }
       for (const event of [...events].reverse())
-        await out.line(auditLine(event));
+        await out.line(auditLine(event, out.tint));
       if (events.length === 0) {
         await out.line(server ? `Nothing has changed on ${server.slug} in the last year.` : "Nothing has changed in this workspace in the last year.");
       }
@@ -45941,21 +45986,21 @@ function checkObject(schema, value, path, issues) {
   }
   const properties = isSchema(schema.properties) ? schema.properties : {};
   const required2 = Array.isArray(schema.required) ? schema.required.filter((n) => typeof n === "string") : [];
-  for (const name of required2) {
-    if (value[name] === undefined)
-      issues.push(`${at([...path, name])} is required`);
+  for (const name2 of required2) {
+    if (value[name2] === undefined)
+      issues.push(`${at([...path, name2])} is required`);
   }
-  for (const [name, item] of Object.entries(value)) {
+  for (const [name2, item] of Object.entries(value)) {
     if (item === undefined)
       continue;
-    const propertySchema = properties[name];
+    const propertySchema = properties[name2];
     if (isSchema(propertySchema)) {
-      check2(propertySchema, item, [...path, name], issues);
+      check2(propertySchema, item, [...path, name2], issues);
     } else if (schema.additionalProperties === false) {
-      const suggestion = suggestName(name, Object.keys(properties));
-      issues.push(`${at([...path, name])} is not allowed${suggestion ? ` (did you mean "${suggestion}"?)` : ""}`);
+      const suggestion = suggestName(name2, Object.keys(properties));
+      issues.push(`${at([...path, name2])} is not allowed${suggestion ? ` (did you mean "${suggestion}"?)` : ""}`);
     } else if (isSchema(schema.additionalProperties)) {
-      check2(schema.additionalProperties, item, [...path, name], issues);
+      check2(schema.additionalProperties, item, [...path, name2], issues);
     }
   }
 }
@@ -46016,8 +46061,8 @@ var import_graphql5 = __toESM(require___dev__(), 1);
 
 // ../codegen/src/graphql/input.ts
 var import_graphql3 = __toESM(require___dev__(), 1);
-function scalarSchema(name, warnings, path) {
-  switch (name) {
+function scalarSchema(name2, warnings, path) {
+  switch (name2) {
     case "ID":
     case "String":
       return { type: "string" };
@@ -46036,8 +46081,8 @@ function scalarSchema(name, warnings, path) {
     case "URL":
       return { type: "string", format: "uri" };
     default:
-      warnings.push(`${path} uses the custom scalar ${name}, sent as a string.`);
-      return { type: "string", title: name };
+      warnings.push(`${path} uses the custom scalar ${name2}, sent as a string.`);
+      return { type: "string", title: name2 };
   }
 }
 function described(schema, description) {
@@ -46097,10 +46142,10 @@ var MAX_DEPTH = 4;
 var MAX_ABSTRACT_TYPES = 8;
 var PAGE_SIZE = 10;
 function pageArgument(args) {
-  for (const name of ["first", "last"]) {
-    const arg = args.find((candidate) => candidate.name === name);
+  for (const name2 of ["first", "last"]) {
+    const arg = args.find((candidate) => candidate.name === name2);
     if (arg && import_graphql4.getNamedType(arg.type).name === "Int")
-      return `(${name}: ${PAGE_SIZE})`;
+      return `(${name2}: ${PAGE_SIZE})`;
   }
   return "";
 }
@@ -46148,7 +46193,7 @@ function abstractSelection(possible, schema, warnings, path, depth, stack) {
       typesByField.set(field.name, (typesByField.get(field.name) ?? new Set).add(String(field.type)));
     }
   }
-  const conflicting = new Set([...typesByField].filter(([, types2]) => types2.size > 1).map(([name]) => name));
+  const conflicting = new Set([...typesByField].filter(([, types2]) => types2.size > 1).map(([name2]) => name2));
   const fragments = variants.map((variant) => {
     const alias = conflicting.size > 0 ? { prefix: variant.name, fields: conflicting } : undefined;
     const inner = objectSelection(variant, schema, warnings, `${path}.${variant.name}`, depth + 1, stack, alias);
@@ -46199,7 +46244,7 @@ function buildGraphQLTool(schema, file2, config2) {
     return { tool: null, warnings: [], errors: [`The schema has no ${type} field ${field}.`] };
   const warnings = [];
   const selection = selectionFor(definition.type, schema, warnings, field, 0, []);
-  const name = `${type === "query" ? "Query" : "Mutation"}${field.charAt(0).toUpperCase()}${field.slice(1)}`;
+  const name2 = `${type === "query" ? "Query" : "Mutation"}${field.charAt(0).toUpperCase()}${field.slice(1)}`;
   const tool = {
     name: file2.name,
     ...file2.title ? { title: file2.title } : {},
@@ -46218,7 +46263,7 @@ function buildGraphQLTool(schema, file2, config2) {
       field,
       document: operationDocument({
         type,
-        name,
+        name: name2,
         field,
         fieldArguments: definition.args,
         selection
@@ -46338,16 +46383,16 @@ function convert(value) {
     out.type = withNull(out.type);
   if (isRecord8(value.properties) && Array.isArray(out.required)) {
     const kept = new Set(Object.keys(out.properties));
-    out.required = out.required.filter((name) => typeof name === "string" && kept.has(name));
+    out.required = out.required.filter((name2) => typeof name2 === "string" && kept.has(name2));
   }
   return out;
 }
 function writableProperties(properties) {
   const out = {};
-  for (const [name, schema] of Object.entries(properties)) {
+  for (const [name2, schema] of Object.entries(properties)) {
     if (isRecord8(schema) && schema.readOnly === true)
       continue;
-    out[name] = toInputSchema(schema);
+    out[name2] = toInputSchema(schema);
   }
   return out;
 }
@@ -46384,10 +46429,10 @@ function overlappingOneOf(schema) {
       if (i2 === j || !isObjectBranch(second))
         return;
       const secondProps = isRecord8(second.properties) ? new Set(Object.keys(second.properties)) : new Set;
-      if (second.additionalProperties === false && [...defines].some((name) => !secondProps.has(name)))
+      if (second.additionalProperties === false && [...defines].some((name2) => !secondProps.has(name2)))
         return;
       const requires = requiredOf(second);
-      if (!requires.every((name) => defines.has(name)))
+      if (!requires.every((name2) => defines.has(name2)))
         return;
       const why = requires.length === 0 ? `branch ${j + 1} requires nothing` : `branch ${j + 1} only requires ${requires.join(", ")}, which branch ${i2 + 1} also defines`;
       notes.push(`oneOf branches ${i2 + 1} and ${j + 1} overlap (${why}), so one value fits both. The tool accepts either; give each branch a distinct required property to keep them apart.`);
@@ -46476,26 +46521,26 @@ function buildInput(doc2, operation) {
   const required2 = [];
   const params = {};
   for (const parameter of operation.parameters) {
-    const name = parameter.name;
+    const name2 = parameter.name;
     const location = parameter.in;
     if (location === "body" || location === "formData")
       continue;
     if (location !== "path" && location !== "query" && location !== "header") {
-      warnings.push(`The ${String(location)} parameter "${name}" is not sent: tools send path, query and header parameters only.`);
+      warnings.push(`The ${String(location)} parameter "${name2}" is not sent: tools send path, query and header parameters only.`);
       continue;
     }
-    if (name === "body") {
+    if (name2 === "body") {
       errors5.push('A parameter is named "body", which is the name a tool gives its request body. Rename the parameter in the spec.');
       continue;
     }
-    if (params[name]) {
-      warnings.push(`"${name}" is both a ${params[name]} and a ${location} parameter; the ${params[name]} one is kept.`);
+    if (params[name2]) {
+      warnings.push(`"${name2}" is both a ${params[name2]} and a ${location} parameter; the ${params[name2]} one is kept.`);
       continue;
     }
-    params[name] = location;
-    properties[name] = toInputSchema(withDescription(parameterSchema(parameter, swagger2), text3(parameter.description)));
+    params[name2] = location;
+    properties[name2] = toInputSchema(withDescription(parameterSchema(parameter, swagger2), text3(parameter.description)));
     if (parameter.required === true || location === "path")
-      required2.push(name);
+      required2.push(name2);
   }
   let body;
   const found = swagger2 ? swagger2Body(operation.parameters, warnings) : openApi3Body(operation.op, warnings);
@@ -46765,15 +46810,15 @@ function generateBundle(input2) {
     headers: config2.upstream.headers,
     discovery: config2.settings.discovery,
     tools,
-    prompts: definition.prompts.map(({ name, title, description, arguments: args, template }) => ({
-      name,
+    prompts: definition.prompts.map(({ name: name2, title, description, arguments: args, template }) => ({
+      name: name2,
       ...title ? { title } : {},
       description,
       arguments: args,
       template
     })),
-    resources: definition.resources.map(({ name, uri, title, description, mimeType, content }) => ({
-      name,
+    resources: definition.resources.map(({ name: name2, uri, title, description, mimeType, content }) => ({
+      name: name2,
       uri,
       ...title ? { title } : {},
       ...description ? { description } : {},
@@ -46880,11 +46925,17 @@ function summaryLine(summary) {
 // src/findings.ts
 var MARK = { error: "✗", warning: "!", info: "·" };
 var ORDER = ["error", "warning", "info"];
+var LEVEL_TONE = {
+  error: "fail",
+  warning: "warn",
+  info: "dim"
+};
 function plural2(n, noun) {
   return `${n} ${noun}${n === 1 ? "" : "s"}`;
 }
-function findingLine(finding3) {
-  return `${MARK[finding3.level]} ${finding3.file || "."}  ${finding3.message}  [${finding3.rule}]`;
+function findingLine(finding3, tint = plain) {
+  const where = tint(LEVEL_TONE[finding3.level], `${MARK[finding3.level]} ${finding3.file || "."}`);
+  return `${where}  ${finding3.message}  ${tint("dim", `[${finding3.rule}]`)}`;
 }
 function sortFindings(findings) {
   return [...findings].sort((a, b) => ORDER.indexOf(a.level) - ORDER.indexOf(b.level) || a.file.localeCompare(b.file));
@@ -46955,20 +47006,20 @@ function inputsOf(schema, prefix = "") {
   const required2 = new Set(Array.isArray(schema.required) ? schema.required : []);
   return Object.entries(properties).flatMap(([key, value]) => {
     const property = isRecord11(value) ? value : {};
-    const name = `${prefix}${key}`;
+    const name2 = `${prefix}${key}`;
     if (isRecord11(property.properties))
-      return inputsOf(property, `${name}.`);
+      return inputsOf(property, `${name2}.`);
     const description = typeof property.description === "string" ? property.description : null;
-    return [{ name, type: typeOf(property), required: required2.has(key), description }];
+    return [{ name: name2, type: typeOf(property), required: required2.has(key), description }];
   });
 }
-function findingLabels(findings) {
-  return findings.map((finding3) => `${MARK2[finding3.level]} ${LABEL[finding3.rule] ?? finding3.rule}`).join("  ");
+function findingLabels(findings, tint) {
+  return findings.map((finding3) => tint(LEVEL_TONE[finding3.level], `${MARK2[finding3.level]} ${LABEL[finding3.rule] ?? finding3.rule}`)).join("  ");
 }
-function listLines(rows, unexposed, all) {
+function listLines(rows, unexposed, all, tint = plain) {
   const findings = rows.reduce((sum, row) => sum + row.findings.length, 0);
   const lines = [
-    `${plural2(rows.length, "tool")} in tools/ · ${findings === 0 ? "no findings" : plural2(findings, "finding")}`
+    tint("dim", `${plural2(rows.length, "tool")} in tools/ · ${findings === 0 ? "no findings" : plural2(findings, "finding")}`)
   ];
   const shown = all || rows.length <= LIST_LIMIT + LIST_SLACK ? rows : rows.slice(0, LIST_LIMIT);
   if (shown.length > 0)
@@ -46977,17 +47028,17 @@ function listLines(rows, unexposed, all) {
   const opWidth = Math.max(...shown.map((row) => row.operation.length)) + 2;
   for (const row of shown) {
     const head = `  ${row.name.padEnd(nameWidth)}${row.effect.padEnd(10)}`;
-    lines.push(row.findings.length === 0 ? `${head}${row.operation}` : `${head}${row.operation.padEnd(opWidth)}${findingLabels(row.findings)}`);
+    lines.push(row.findings.length === 0 ? `${head}${row.operation}` : `${head}${row.operation.padEnd(opWidth)}${findingLabels(row.findings, tint)}`);
   }
   const hidden = rows.slice(shown.length);
   if (hidden.length > 0) {
     const flagged = hidden.filter((row) => row.findings.length > 0).length;
     const note = flagged === 0 ? "" : `, ${flagged} with findings`;
-    lines.push(`  … ${hidden.length} more${note}. --all lists every one; --json for scripts.`);
+    lines.push(tint("dim", `  … ${hidden.length} more${note}. --all lists every one; --json for scripts.`));
   }
   if (unexposed > 0) {
     const are = unexposed === 1 ? "operation in the spec is" : "operations in the spec are";
-    lines.push("", `${unexposed} ${are} not exposed. sokie tools --unexposed lists them.`);
+    lines.push("", tint("dim", `${unexposed} ${are} not exposed. sokie tools --unexposed lists them.`));
   }
   return lines;
 }
@@ -46997,17 +47048,18 @@ var HINTS = [
   ["idempotentHint", "idempotent"],
   ["openWorldHint", "openWorld"]
 ];
-function detailLines(tool) {
+function detailLines(tool, tint = plain) {
   const annotations = HINTS.filter(([key]) => tool.annotations[key] !== undefined).map(([key, label]) => `${label} ${String(tool.annotations[key])}`).join(" · ");
   const input2 = tool.input.map((field) => `${field.name} ${field.type}${field.required ? " (required)" : ""}`).join(" · ");
   const lines = [
-    tool.title ? `${tool.name} · ${tool.title}` : tool.name,
-    `${tool.operation} · ${tool.file} · effect ${tool.effect}`,
+    tint("strong", tool.title ? `${tool.name} · ${tool.title}` : tool.name),
+    tint("dim", `${tool.operation} · ${tool.file} · effect ${tool.effect}`),
     `annotations  ${annotations || "none"}`,
     `input        ${input2 || "none"}`
   ];
   for (const finding3 of tool.findings) {
-    lines.push(`${MARK2[finding3.level]} ${finding3.rule}: ${finding3.message}`);
+    const rule = tint(LEVEL_TONE[finding3.level], `${MARK2[finding3.level]} ${finding3.rule}:`);
+    lines.push(`${rule} ${finding3.message}`);
   }
   return lines;
 }
@@ -47017,22 +47069,22 @@ var CATALOG_TOOLS = new Set(["searchTools", "getToolDefinition"]);
 function record2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
 }
-function routeCall(definition, name, input2) {
+function routeCall(definition, name2, input2) {
   if (!definition)
     return { problem: "not_buildable" };
   const discovery = definition.config.settings.discovery;
   const rows = toolRows(definition, []);
-  const effect = rows.find((row) => row.name === name)?.effect;
+  const effect = rows.find((row) => row.name === name2)?.effect;
   if (effect)
-    return { tool: name, call: caseCall({ tool: name, input: input2 }, discovery), effect };
+    return { tool: name2, call: caseCall({ tool: name2, input: input2 }, discovery), effect };
   if (discovery === "search") {
-    if (CATALOG_TOOLS.has(name))
-      return { tool: name, call: { name, arguments: input2 }, effect: "read" };
-    if (name === "useTool" && typeof input2.name === "string") {
+    if (CATALOG_TOOLS.has(name2))
+      return { tool: name2, call: { name: name2, arguments: input2 }, effect: "read" };
+    if (name2 === "useTool" && typeof input2.name === "string") {
       return routeCall(definition, input2.name, record2(input2.arguments));
     }
   }
-  return { problem: "unknown_tool", tool: name };
+  return { problem: "unknown_tool", tool: name2 };
 }
 
 // src/call-target.ts
@@ -47098,9 +47150,9 @@ var __hasOwnProp2 = Object.prototype.hasOwnProperty;
 var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __exportAll = (all, symbols) => {
   let target = {};
-  for (var name in all) {
-    __defProp5(target, name, {
-      get: all[name],
+  for (var name2 in all) {
+    __defProp5(target, name2, {
+      get: all[name2],
       enumerable: true
     });
   }
@@ -51472,7 +51524,7 @@ function walkRequestedSchema(converted2, vendor) {
   const unsupported = [];
   for (const [key, value] of Object.entries(converted2))
     if (key === "properties" && isJsonObject(value))
-      pruned[key] = Object.fromEntries(Object.entries(value).map(([name, node2]) => [name, walkProperty(node2, `properties.${name}`, vendor, unsupported)]));
+      pruned[key] = Object.fromEntries(Object.entries(value).map(([name2, node2]) => [name2, walkProperty(node2, `properties.${name2}`, vendor, unsupported)]));
     else if (ROOT_KEYS.has(key))
       pruned[key] = value;
     else if (!isAnnotationOnlyJsonSchemaKeyword(key))
@@ -51484,7 +51536,7 @@ function walkRequestedSchema(converted2, vendor) {
 function describeUnsupportedProperties(pruned, fallback) {
   if (!isJsonObject(pruned.properties))
     return fallback;
-  const offenders = Object.entries(pruned.properties).filter(([, node2]) => !parseSchema(PrimitiveSchemaDefinitionSchema, node2).success).map(([name]) => `properties.${name}`);
+  const offenders = Object.entries(pruned.properties).filter(([, node2]) => !parseSchema(PrimitiveSchemaDefinitionSchema, node2).success).map(([name2]) => `properties.${name2}`);
   return offenders.length > 0 ? offenders.join(", ") : fallback;
 }
 function findDroppedConstraintPaths(original, parsed, path = "") {
@@ -51855,9 +51907,9 @@ var authSchemas = {
 var _specTypeSchemas = {};
 var _isSpecType = {};
 function register(key, schema) {
-  const name = key.slice(0, -6);
-  _specTypeSchemas[name] = schema;
-  _isSpecType[name] = (v) => schema.safeParse(v).success;
+  const name2 = key.slice(0, -6);
+  _specTypeSchemas[name2] = schema;
+  _isSpecType[name2] = (v) => schema.safeParse(v).success;
 }
 for (const key of SPEC_SCHEMA_KEYS)
   register(key, schemas_exports[key]);
@@ -52996,9 +53048,9 @@ var require_scope = /* @__PURE__ */ __commonJSMin((exports) => {
   exports.ValueScope = exports.ValueScopeName = exports.Scope = exports.varKinds = exports.UsedValueState = undefined;
   const code_1 = require_code$1();
   var ValueError = class extends Error {
-    constructor(name) {
-      super(`CodeGen: "code" for ${name} not defined`);
-      this.value = name.value;
+    constructor(name2) {
+      super(`CodeGen: "code" for ${name2} not defined`);
+      this.value = name2.value;
     }
   };
   var UsedValueState;
@@ -53070,8 +53122,8 @@ var require_scope = /* @__PURE__ */ __commonJSMin((exports) => {
       var _a4;
       if (value.ref === undefined)
         throw new Error("CodeGen: ref must be passed in value");
-      const name = this.toName(nameOrPrefix);
-      const { prefix } = name;
+      const name2 = this.toName(nameOrPrefix);
+      const { prefix } = name2;
       const valueKey = (_a4 = value.key) !== null && _a4 !== undefined ? _a4 : value.ref;
       let vs = this._values[prefix];
       if (vs) {
@@ -53080,15 +53132,15 @@ var require_scope = /* @__PURE__ */ __commonJSMin((exports) => {
           return _name;
       } else
         vs = this._values[prefix] = /* @__PURE__ */ new Map;
-      vs.set(valueKey, name);
+      vs.set(valueKey, name2);
       const s = this._scope[prefix] || (this._scope[prefix] = []);
       const itemIndex = s.length;
       s[itemIndex] = value.ref;
-      name.setValue(value, {
+      name2.setValue(value, {
         property: prefix,
         itemIndex
       });
-      return name;
+      return name2;
     }
     getValue(prefix, keyOrRef) {
       const vs = this._values[prefix];
@@ -53097,17 +53149,17 @@ var require_scope = /* @__PURE__ */ __commonJSMin((exports) => {
       return vs.get(keyOrRef);
     }
     scopeRefs(scopeName, values = this._values) {
-      return this._reduceValues(values, (name) => {
-        if (name.scopePath === undefined)
-          throw new Error(`CodeGen: name "${name}" has no value`);
-        return (0, code_1._)`${scopeName}${name.scopePath}`;
+      return this._reduceValues(values, (name2) => {
+        if (name2.scopePath === undefined)
+          throw new Error(`CodeGen: name "${name2}" has no value`);
+        return (0, code_1._)`${scopeName}${name2.scopePath}`;
       });
     }
     scopeCode(values = this._values, usedValues, getCode) {
-      return this._reduceValues(values, (name) => {
-        if (name.value === undefined)
-          throw new Error(`CodeGen: name "${name}" has no value`);
-        return name.value.code;
+      return this._reduceValues(values, (name2) => {
+        if (name2.value === undefined)
+          throw new Error(`CodeGen: name "${name2}" has no value`);
+        return name2.value.code;
       }, usedValues, getCode);
     }
     _reduceValues(values, valueCode, usedValues = {}, getCode) {
@@ -53117,19 +53169,19 @@ var require_scope = /* @__PURE__ */ __commonJSMin((exports) => {
         if (!vs)
           continue;
         const nameSet = usedValues[prefix] = usedValues[prefix] || /* @__PURE__ */ new Map;
-        vs.forEach((name) => {
-          if (nameSet.has(name))
+        vs.forEach((name2) => {
+          if (nameSet.has(name2))
             return;
-          nameSet.set(name, UsedValueState.Started);
-          let c = valueCode(name);
+          nameSet.set(name2, UsedValueState.Started);
+          let c = valueCode(name2);
           if (c) {
             const def = this.opts.es5 ? exports.varKinds.var : exports.varKinds.const;
-            code2 = (0, code_1._)`${code2}${def} ${name} = ${c};${this.opts._n}`;
-          } else if (c = getCode === null || getCode === undefined ? undefined : getCode(name))
+            code2 = (0, code_1._)`${code2}${def} ${name2} = ${c};${this.opts._n}`;
+          } else if (c = getCode === null || getCode === undefined ? undefined : getCode(name2))
             code2 = (0, code_1._)`${code2}${c}${this.opts._n}`;
           else
-            throw new ValueError(name);
-          nameSet.set(name, UsedValueState.Completed);
+            throw new ValueError(name2);
+          nameSet.set(name2, UsedValueState.Completed);
         });
       }
       return code2;
@@ -53237,10 +53289,10 @@ var require_codegen = /* @__PURE__ */ __commonJSMin((exports) => {
     }
   };
   var Def = class extends Node {
-    constructor(varKind, name, rhs) {
+    constructor(varKind, name2, rhs) {
       super();
       this.varKind = varKind;
-      this.name = name;
+      this.name = name2;
       this.rhs = rhs;
     }
     render({ es5, _n }) {
@@ -53458,28 +53510,28 @@ var require_codegen = /* @__PURE__ */ __commonJSMin((exports) => {
     }
   };
   var ForRange = class extends For {
-    constructor(varKind, name, from, to) {
+    constructor(varKind, name2, from, to) {
       super();
       this.varKind = varKind;
-      this.name = name;
+      this.name = name2;
       this.from = from;
       this.to = to;
     }
     render(opts) {
       const varKind = opts.es5 ? scope_1.varKinds.var : this.varKind;
-      const { name, from, to } = this;
-      return `for(${varKind} ${name}=${from}; ${name}<${to}; ${name}++)` + super.render(opts);
+      const { name: name2, from, to } = this;
+      return `for(${varKind} ${name2}=${from}; ${name2}<${to}; ${name2}++)` + super.render(opts);
     }
     get names() {
       return addExprNames(addExprNames(super.names, this.from), this.to);
     }
   };
   var ForIter = class extends For {
-    constructor(loop, varKind, name, iterable) {
+    constructor(loop, varKind, name2, iterable) {
       super();
       this.loop = loop;
       this.varKind = varKind;
-      this.name = name;
+      this.name = name2;
       this.iterable = iterable;
     }
     render(opts) {
@@ -53496,9 +53548,9 @@ var require_codegen = /* @__PURE__ */ __commonJSMin((exports) => {
     }
   };
   var Func = class extends BlockNode {
-    constructor(name, args, async) {
+    constructor(name2, args, async) {
       super();
-      this.name = name;
+      this.name = name2;
       this.args = args;
       this.async = async;
     }
@@ -53585,9 +53637,9 @@ var require_codegen = /* @__PURE__ */ __commonJSMin((exports) => {
       return this._extScope.name(prefix);
     }
     scopeValue(prefixOrName, value) {
-      const name = this._extScope.value(prefixOrName, value);
-      (this._values[name.prefix] || (this._values[name.prefix] = /* @__PURE__ */ new Set)).add(name);
-      return name;
+      const name2 = this._extScope.value(prefixOrName, value);
+      (this._values[name2.prefix] || (this._values[name2.prefix] = /* @__PURE__ */ new Set)).add(name2);
+      return name2;
     }
     getScopeValue(prefix, keyOrRef) {
       return this._extScope.getValue(prefix, keyOrRef);
@@ -53599,11 +53651,11 @@ var require_codegen = /* @__PURE__ */ __commonJSMin((exports) => {
       return this._extScope.scopeCode(this._values);
     }
     _def(varKind, nameOrPrefix, rhs, constant) {
-      const name = this._scope.toName(nameOrPrefix);
+      const name2 = this._scope.toName(nameOrPrefix);
       if (rhs !== undefined && constant)
-        this._constants[name.str] = rhs;
-      this._leafNode(new Def(varKind, name, rhs));
-      return name;
+        this._constants[name2.str] = rhs;
+      this._leafNode(new Def(varKind, name2, rhs));
+      return name2;
     }
     const(nameOrPrefix, rhs, _constant) {
       return this._def(scope_1.varKinds.const, nameOrPrefix, rhs, _constant);
@@ -53670,25 +53722,25 @@ var require_codegen = /* @__PURE__ */ __commonJSMin((exports) => {
       return this._for(new ForLoop(iteration), forBody);
     }
     forRange(nameOrPrefix, from, to, forBody, varKind = this.opts.es5 ? scope_1.varKinds.var : scope_1.varKinds.let) {
-      const name = this._scope.toName(nameOrPrefix);
-      return this._for(new ForRange(varKind, name, from, to), () => forBody(name));
+      const name2 = this._scope.toName(nameOrPrefix);
+      return this._for(new ForRange(varKind, name2, from, to), () => forBody(name2));
     }
     forOf(nameOrPrefix, iterable, forBody, varKind = scope_1.varKinds.const) {
-      const name = this._scope.toName(nameOrPrefix);
+      const name2 = this._scope.toName(nameOrPrefix);
       if (this.opts.es5) {
         const arr = iterable instanceof code_1.Name ? iterable : this.var("_arr", iterable);
         return this.forRange("_i", 0, (0, code_1._)`${arr}.length`, (i2) => {
-          this.var(name, (0, code_1._)`${arr}[${i2}]`);
-          forBody(name);
+          this.var(name2, (0, code_1._)`${arr}[${i2}]`);
+          forBody(name2);
         });
       }
-      return this._for(new ForIter("of", varKind, name, iterable), () => forBody(name));
+      return this._for(new ForIter("of", varKind, name2, iterable), () => forBody(name2));
     }
     forIn(nameOrPrefix, obj, forBody, varKind = this.opts.es5 ? scope_1.varKinds.var : scope_1.varKinds.const) {
       if (this.opts.ownProperties)
         return this.forOf(nameOrPrefix, (0, code_1._)`Object.keys(${obj})`, forBody);
-      const name = this._scope.toName(nameOrPrefix);
-      return this._for(new ForIter("in", varKind, name, obj), () => forBody(name));
+      const name2 = this._scope.toName(nameOrPrefix);
+      return this._for(new ForIter("in", varKind, name2, obj), () => forBody(name2));
     }
     endFor() {
       return this._endBlockNode(For);
@@ -53743,8 +53795,8 @@ var require_codegen = /* @__PURE__ */ __commonJSMin((exports) => {
       this._nodes.length = len2;
       return this;
     }
-    func(name, args = code_1.nil, async, funcBody) {
-      this._blockNode(new Func(name, args, async));
+    func(name2, args = code_1.nil, async, funcBody) {
+      this._blockNode(new Func(name2, args, async));
       if (funcBody)
         this.code(funcBody).endFunc();
       return this;
@@ -56055,8 +56107,8 @@ var require_schemes = /* @__PURE__ */ __commonJSMin((exports, module) => {
     "urn",
     "urn:uuid"
   ];
-  function isValidSchemeName(name) {
-    return supportedSchemeNames.indexOf(name) !== -1;
+  function isValidSchemeName(name2) {
+    return supportedSchemeNames.indexOf(name2) !== -1;
   }
   function wsIsSecure(wsComponent) {
     if (wsComponent.secure === true)
@@ -56843,10 +56895,10 @@ var require_core$3 = /* @__PURE__ */ __commonJSMin((exports) => {
       }
       return this;
     }
-    addFormat(name, format) {
+    addFormat(name2, format) {
       if (typeof format == "string")
         format = new RegExp(format);
-      this.formats[name] = format;
+      this.formats[name2] = format;
       return this;
     }
     errorsText(errors5 = this.errors, { separator = ", ", dataVar = "data" } = {}) {
@@ -56966,10 +57018,10 @@ var require_core$3 = /* @__PURE__ */ __commonJSMin((exports) => {
         this.addSchema(optsSchemas[key], key);
   }
   function addInitialFormats() {
-    for (const name in this.opts.formats) {
-      const format = this.opts.formats[name];
+    for (const name2 in this.opts.formats) {
+      const format = this.opts.formats[name2];
       if (format)
-        this.addFormat(name, format);
+        this.addFormat(name2, format);
     }
   }
   function addInitialKeywords(defs) {
@@ -60345,10 +60397,10 @@ var require_dist = /* @__PURE__ */ __commonJSMin((exports, module) => {
       (0, limit_1.default)(ajv);
     return ajv;
   };
-  formatsPlugin.get = (name, mode = "full") => {
-    const f = (mode === "fast" ? formats_1.fastFormats : formats_1.fullFormats)[name];
+  formatsPlugin.get = (name2, mode = "full") => {
+    const f = (mode === "fast" ? formats_1.fastFormats : formats_1.fullFormats)[name2];
     if (!f)
-      throw new Error(`Unknown format "${name}"`);
+      throw new Error(`Unknown format "${name2}"`);
     return f;
   };
   function addFormats(ajv, list, fs, exportName) {
@@ -61730,7 +61782,7 @@ var ClientResponseCache = class {
     this._toolOutputValidatorIndex = undefined;
     this._serverIdentity = "";
   }
-  async toolDefinition(name) {
+  async toolDefinition(name2) {
     const entry = await this._probe("tools/list");
     if (entry === undefined) {
       this._toolIndex = undefined;
@@ -61747,9 +61799,9 @@ var ClientResponseCache = class {
         byName: byName2
       };
     }
-    return this._toolIndex.byName.get(name);
+    return this._toolIndex.byName.get(name2);
   }
-  async outputValidator(name, compile3) {
+  async outputValidator(name2, compile3) {
     const entry = await this._probe("tools/list");
     if (entry === undefined) {
       this._toolOutputValidatorIndex = undefined;
@@ -61768,7 +61820,7 @@ var ClientResponseCache = class {
         byName: byName2
       };
     }
-    return this._toolOutputValidatorIndex.byName.get(name);
+    return this._toolOutputValidatorIndex.byName.get(name2);
   }
   _decodeListTools(entry) {
     try {
@@ -62935,8 +62987,8 @@ var Client = class extends Protocol {
       };
     }
   }
-  async _resolveXMcpHeaderScan(name, override) {
-    const tool = override ?? await this._cache.toolDefinition(name);
+  async _resolveXMcpHeaderScan(name2, override) {
+    const tool = override ?? await this._cache.toolDefinition(name2);
     return tool === undefined ? undefined : scanXMcpHeaderDeclarations(tool.inputSchema);
   }
   async readResource(params, options) {
@@ -63780,10 +63832,10 @@ var StreamableHTTPClientTransport = class {
       if (isHandshake)
         headers.delete("mcp-session-id");
       if (options?.headers !== undefined)
-        for (const [name, value] of Object.entries(options.headers)) {
-          if (RESERVED_REQUEST_HEADER_NAMES.has(name.toLowerCase()))
+        for (const [name2, value] of Object.entries(options.headers)) {
+          if (RESERVED_REQUEST_HEADER_NAMES.has(name2.toLowerCase()))
             continue;
-          headers.set(name, value);
+          headers.set(name2, value);
         }
       headers.set("content-type", "application/json");
       const types2 = [
@@ -63961,12 +64013,12 @@ function listCatalog(serverUrl, token) {
     return { tools: tools.tools, prompts: prompts.prompts, resources: resources.resources };
   });
 }
-function callTool(serverUrl, token, name, args) {
-  return withClient(serverUrl, token, (client) => client.callTool({ name, arguments: args }));
+function callTool(serverUrl, token, name2, args) {
+  return withClient(serverUrl, token, (client) => client.callTool({ name: name2, arguments: args }));
 }
-function callToolReporting(serverUrl, token, name, args) {
+function callToolReporting(serverUrl, token, name2, args) {
   return withClient(serverUrl, token, async (client) => ({
-    result: await client.callTool({ name, arguments: args }),
+    result: await client.callTool({ name: name2, arguments: args }),
     serverVersion: client.getServerVersion()?.version ?? null
   }));
 }
@@ -64010,21 +64062,21 @@ function readDevSecrets(root) {
     return { values: new Map, malformed: [] };
   return parseDevSecrets(readFileSync4(path, "utf8"));
 }
-function writeDevSecret(root, name, value) {
-  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name))
-    throw new Error(`${name} isn't a variable name.`);
+function writeDevSecret(root, name2, value) {
+  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name2))
+    throw new Error(`${name2} isn't a variable name.`);
   if (/[\r\n]/.test(value))
-    throw new Error(`${name}'s value has a line break.`);
+    throw new Error(`${name2}'s value has a line break.`);
   const path = join4(root, DEV_SECRETS_FILE);
   mkdirSync3(dirname3(path), { recursive: true, mode: 448 });
   const lines = existsSync4(path) ? readFileSync4(path, "utf8").split(/\r?\n/) : [];
   if (lines.at(-1) === "")
     lines.pop();
-  const own2 = new RegExp(`^\\s*(?:export\\s+)?${name}\\s*=`);
+  const own2 = new RegExp(`^\\s*(?:export\\s+)?${name2}\\s*=`);
   const quoted = value !== value.trim() || /^(["']).*\1$/.test(value);
   const at2 = lines.findIndex((line) => own2.test(line));
   const kept = lines.filter((line) => !own2.test(line));
-  kept.splice(at2 === -1 ? kept.length : at2, 0, `${name}=${quoted ? `"${value}"` : value}`);
+  kept.splice(at2 === -1 ? kept.length : at2, 0, `${name2}=${quoted ? `"${value}"` : value}`);
   writeFileSync3(path, `${kept.join(`
 `)}
 `, { mode: 384 });
@@ -64052,8 +64104,8 @@ function needsOAuthToken(config2) {
 }
 function reportSecrets(config2, secrets) {
   const declared = Object.entries(config2.secrets);
-  const missing = declared.filter(([name]) => !secrets.values.get(name)).map(([name, declaration]) => ({ name, description: declaration.description }));
-  const unknown2 = [...secrets.values.keys()].filter((name) => !config2.secrets[name] && !STAND_INS.has(name));
+  const missing = declared.filter(([name2]) => !secrets.values.get(name2)).map(([name2, declaration]) => ({ name: name2, description: declaration.description }));
+  const unknown2 = [...secrets.values.keys()].filter((name2) => !config2.secrets[name2] && !STAND_INS.has(name2));
   const standInsMissing = [
     ...needsCallerKey(config2) && !secrets.values.get(CALLER_KEY) ? [CALLER_KEY] : [],
     ...needsOAuthToken(config2) && !secrets.values.get(OAUTH_TOKEN) ? [OAUTH_TOKEN] : []
@@ -64062,10 +64114,10 @@ function reportSecrets(config2, secrets) {
 }
 function secretBindings(config2, secrets) {
   const bindings = {};
-  for (const name of Object.keys(config2.secrets)) {
-    const value = secrets.values.get(name);
+  for (const name2 of Object.keys(config2.secrets)) {
+    const value = secrets.values.get(name2);
     if (value)
-      bindings[name] = value;
+      bindings[name2] = value;
   }
   const baseUrl = secrets.values.get(UPSTREAM_BASE_URL);
   if (baseUrl)
@@ -64143,6 +64195,32 @@ function writeLink(root, site, link) {
 
 // src/prompt.ts
 import { stderr, stdin } from "node:process";
+
+// src/style.ts
+var SGR = {
+  ok: [32, 39],
+  warn: [33, 39],
+  fail: [31, 39],
+  dim: [90, 39],
+  strong: [1, 22]
+};
+function colorFor(stream, env = process.env) {
+  if (env.NO_COLOR !== undefined && env.NO_COLOR !== "")
+    return false;
+  if (env.FORCE_COLOR !== undefined)
+    return env.FORCE_COLOR !== "0" && env.FORCE_COLOR !== "false";
+  if (env.TERM === "dumb")
+    return false;
+  return stream.isTTY === true;
+}
+function paint(on, tone, text5) {
+  if (!on || tone === undefined || text5 === "")
+    return text5;
+  const [open2, close] = SGR[tone];
+  return `\x1B[${open2}m${text5}\x1B[${close}m`;
+}
+
+// src/prompt.ts
 async function readSecretValue(label) {
   if (!stdin.isTTY) {
     const chunks = [];
@@ -64190,7 +64268,7 @@ async function readLine(label) {
   return line.trim();
 }
 async function confirm(question) {
-  const answer = await readLine(`${question} (y/N)`);
+  const answer = await readLine(paint(colorFor(stderr), "warn", `${question} (y/N)`));
   return /^y(es)?$/i.test(answer);
 }
 
@@ -64215,8 +64293,8 @@ function parseInput(raw) {
   }
   return parsed;
 }
-function localRoute(root, name, input2) {
-  return routeCall(buildFromFiles(readRepoFiles(root)).definition, name, input2);
+function localRoute(root, name2, input2) {
+  return routeCall(buildFromFiles(readRepoFiles(root)).definition, name2, input2);
 }
 function answeringDeploy(target, serverVersion) {
   if (target.kind === "dev" || serverVersion === null || !/^\d+$/.test(serverVersion))
@@ -64224,16 +64302,16 @@ function answeringDeploy(target, serverVersion) {
   return Number(serverVersion);
 }
 async function callAndPrint(out, deps, endpoint, call) {
-  const { name, effect } = call;
+  const { name: name2, effect } = call;
   const where = targetName(call.target);
   if (effect !== "read" && !call.yes) {
-    const what = effect ? `${name} is ${effect}.` : `${name}'s effect can't be read from here.`;
+    const what = effect ? `${name2} is ${effect}.` : `${name2}'s effect can't be read from here.`;
     if (!deps.interactive) {
       const message = `${what} There's no terminal to ask in, so pass --yes to call it on ${where}.`;
       return fail(out, "confirmation_needed", message, EXIT.usage);
     }
     if (!await deps.confirm(`${what} Call it on ${where}?`)) {
-      return fail(out, "declined", `Didn't call ${name}.`, EXIT.no);
+      return fail(out, "declined", `Didn't call ${name2}.`, EXIT.no);
     }
   }
   const started = performance.now();
@@ -64244,11 +64322,11 @@ async function callAndPrint(out, deps, endpoint, call) {
   } catch (error62) {
     const ms = Math.round(performance.now() - started);
     const message = error62 instanceof Error ? error62.message : String(error62);
-    await out.problem(`✗ ${message}`);
-    await out.line(summaryLine({ ok: false, ms, errorClass: null, requestId: null }));
+    await out.problem(`✗ ${message}`, "fail");
+    await out.line(summaryLine({ ok: false, ms, errorClass: null, requestId: null }), "fail");
     await out.result({
       ok: false,
-      tool: name,
+      tool: name2,
       target: where,
       ms,
       error: { code: "mcp_error", message }
@@ -64260,10 +64338,10 @@ async function callAndPrint(out, deps, endpoint, call) {
   const deploy = answeringDeploy(call.target, outcome.serverVersion);
   for (const line of contentLines(result))
     await out.line(line);
-  await out.line(`${summaryLine(summary)}${deploy === null ? "" : ` · deploy #${deploy}`}`);
+  await out.line(`${summaryLine(summary)}${deploy === null ? "" : ` · deploy #${deploy}`}`, summary.ok ? "ok" : "fail");
   await out.result({
     ...summary,
-    tool: name,
+    tool: name2,
     target: where,
     ...deploy === null ? {} : { deploy },
     effect,
@@ -64281,8 +64359,8 @@ async function runCall(argv, out, deps) {
     preview: { type: "string" },
     production: { type: "boolean", default: false }
   });
-  const [name, ...extra] = positionals;
-  if (!name || extra.length > 0) {
+  const [name2, ...extra] = positionals;
+  if (!name2 || extra.length > 0) {
     throw new UsageError(`Give one tool's name: sokie call getTask --input '{"taskId":"t_1"}'.`);
   }
   const input2 = parseInput(values.input);
@@ -64291,7 +64369,7 @@ async function runCall(argv, out, deps) {
     throw new UsageError("--server picks a deploy: add --preview <n> or --production.");
   }
   const root = resolve(values.dir ?? ".");
-  const local = localRoute(root, name, input2);
+  const local = localRoute(root, name2, input2);
   const yes = values.yes;
   if (target.kind === "dev") {
     if ("problem" in local) {
@@ -64317,7 +64395,7 @@ async function runCall(argv, out, deps) {
       }
       const server = await serverBySlug(client, slug);
       const endpoint = await mintEndpoint(client, server, target);
-      const call = linked === server.slug && !("problem" in local) ? { name: local.tool, request: local.call, effect: local.effect } : { name, request: { name, arguments: input2 }, effect: null };
+      const call = linked === server.slug && !("problem" in local) ? { name: local.tool, request: local.call, effect: local.effect } : { name: name2, request: { name: name2, arguments: input2 }, effect: null };
       return await callAndPrint(out, deps, endpoint, { ...call, target, yes });
     } catch (error62) {
       if (error62 instanceof DeployError)
@@ -64373,7 +64451,7 @@ async function run2(argv, out) {
     resources: build2.bundle.resources.length
   } : null;
   for (const finding3 of findings)
-    await out.line(findingLine(finding3));
+    await out.line(findingLine(finding3, out.tint));
   if (findings.length > 0)
     await out.line();
   if (server) {
@@ -64382,9 +64460,9 @@ async function run2(argv, out) {
       plural2(server.prompts, "prompt"),
       plural2(server.resources, "resource")
     ];
-    await out.line(`OK: ${server.name}, ${parts.join(", ")}.`);
+    await out.line(`OK: ${server.name}, ${parts.join(", ")}.`, "ok");
   } else {
-    await out.line(`${plural2(counts.error, "error")}; nothing can be built from this repository yet.`);
+    await out.line(`${plural2(counts.error, "error")}; nothing can be built from this repository yet.`, "fail");
   }
   await out.result({ ok: server !== null, server, counts, findings });
   return server ? EXIT.ok : EXIT.no;
@@ -64421,8 +64499,8 @@ async function run3(argv, out) {
   return withSignedIn(out, values.site, async (info2, client) => {
     const current = await client.query(fn.cliLimits, {});
     if (verb === "get") {
-      await out.line(`session.max-age  ${current.maxAgeDays}d  (from approval)`);
-      await out.line(`session.idle     ${current.idleDays}d  (without use)`);
+      await out.line(`session.max-age  ${current.maxAgeDays}d  ${out.tint("dim", "(from approval)")}`);
+      await out.line(`session.idle     ${current.idleDays}d  ${out.tint("dim", "(without use)")}`);
       await out.result({ ok: true, site: info2.site, ...current });
       return EXIT.ok;
     }
@@ -64445,7 +64523,7 @@ async function run3(argv, out) {
       }
       throw error62;
     }
-    await out.line(`${key} is now ${next[field]}d. Sign-ins already made follow it at their next refresh.`);
+    await out.line(`${key} is now ${next[field]}d. Sign-ins already made follow it at their next refresh.`, "ok");
     await out.result({ ok: true, site: info2.site, ...next });
     return EXIT.ok;
   });
@@ -64535,7 +64613,8 @@ async function run4(argv, out) {
     server: { type: "string" },
     create: { type: "boolean", default: false },
     public: { type: "boolean", default: false },
-    "no-wait": { type: "boolean", default: false }
+    "no-wait": { type: "boolean", default: false },
+    force: { type: "boolean", default: false }
   });
   if (values.create && values.server)
     throw new UsageError("Use --create or --server, not both.");
@@ -64544,29 +64623,39 @@ async function run4(argv, out) {
   if (!build2.bundle || !build2.config) {
     const findings = sortFindings(build2.findings).filter((finding3) => finding3.level === "error");
     for (const finding3 of findings)
-      await out.problem(findingLine(finding3));
+      await out.problem(findingLine(finding3), LEVEL_TONE[finding3.level]);
     return fail(out, "build_failed", `${plural2(countLevels(findings).error, "error")}; run \`sokie check\`.`, EXIT.no);
   }
-  const { name } = build2.config;
+  const { name: name2 } = build2.config;
   const toolCount = build2.bundle.tools.length;
-  const ship = async (platform, server) => {
-    await out.line(`Deploying ${name} (${plural2(toolCount, "tool")}) to ${server.slug}…`);
-    const deployment = await deployArchive(platform, server.serverId, sourceArchive(readRepoFiles(root)), { wait: !values["no-wait"], progress: (status) => out.line(`  ${status}`) });
+  const ship = async (platform, server, base) => {
+    await out.line(`Deploying ${name2} (${plural2(toolCount, "tool")}) to ${server.slug}…`);
+    const deployment = await deployArchive(platform, server.serverId, sourceArchive(readRepoFiles(root)), {
+      wait: !values["no-wait"],
+      progress: (status) => out.line(`  ${status}`, "dim"),
+      ...base === undefined || values.force ? {} : { base }
+    });
     const url2 = server.url;
     if (deployment.status === "failed") {
-      for (const finding3 of deployment.findings ?? [])
-        await out.problem(findingLine(finding3));
+      for (const finding3 of deployment.findings ?? []) {
+        await out.problem(findingLine(finding3), LEVEL_TONE[finding3.level]);
+      }
       const reason = deployment.error?.message ?? "The deploy failed.";
       await out.result({ ok: false, server, deployment, error: deployment.error ?? null });
-      await out.problem(`✗ ${reason}`);
+      await out.problem(`✗ ${reason}`, "fail");
       return EXIT.no;
     }
-    if (deployment.status === "live")
-      for (const line of liveLines(server, deployment))
-        await out.line(line);
+    if (deployment.status === "live") {
+      const [live, ...rest] = liveLines(server, deployment);
+      if (live)
+        await out.line(live, "ok");
+      for (const line of rest)
+        await out.line(line, "dim");
+    }
     await out.result({ ok: true, server, deployment, url: url2, linkFile: LINK_FILE });
-    return EXIT.ok;
+    return deployment;
   };
+  const exit = (shipped) => typeof shipped === "number" ? shipped : EXIT.ok;
   const deployKey = deployKeyFrom();
   if (deployKey) {
     if (values.create)
@@ -64579,7 +64668,7 @@ async function run4(argv, out) {
       if (values.server && values.server !== server.slug) {
         return fail(out, "wrong_server", `${DEPLOY_KEY_ENV} deploys ${server.slug}, not ${values.server}.`, EXIT.no);
       }
-      return await ship(platformFor(client), server);
+      return exit(await ship(platformFor(client), server));
     } catch (error62) {
       if (error62 instanceof DeployError)
         return fail(out, error62.code, error62.message, EXIT.no);
@@ -64595,7 +64684,7 @@ async function run4(argv, out) {
       const linked = readLink(root, info2.site);
       if (values.create) {
         server = await client.mutation(fn.createServer, {
-          name,
+          name: name2,
           accessMode: values.public ? "public" : "private"
         });
       } else if (values.server) {
@@ -64605,13 +64694,26 @@ async function run4(argv, out) {
       } else {
         return fail(out, "not_linked", `This repository isn't linked to a server on ${info2.site}. Run \`sokie deploy --create\`, or \`--server <slug>\` for one you have.`, EXIT.no);
       }
-      writeLink(root, info2.site, { serverId: server.serverId, slug: server.slug });
       const github = await client.query(fn.link, { serverId: server.serverId });
       if (github && !github.broken) {
-        await out.problem(`Note: ${server.slug} is linked to ${github.repo}. The next push to ${github.defaultBranch} replaces this deploy.`);
+        await out.problem(`Note: ${server.slug} is linked to ${github.repo}. The next push to ${github.defaultBranch} replaces this deploy.`, "warn");
       }
+      const base = !github && linked?.serverId === server.serverId ? linked.base : undefined;
+      writeLink(root, info2.site, {
+        serverId: server.serverId,
+        slug: server.slug,
+        ...base === undefined ? {} : { base }
+      });
       ensureIgnored(root, ".sokie/");
-      return await ship(platformFor(client), server);
+      const shipped = await ship(platformFor(client), server, base);
+      if (!github && typeof shipped !== "number" && shipped.number !== undefined) {
+        writeLink(root, info2.site, {
+          serverId: server.serverId,
+          slug: server.slug,
+          base: shipped.number
+        });
+      }
+      return exit(shipped);
     } catch (error62) {
       if (error62 instanceof DeployError)
         return fail(out, error62.code, error62.message, EXIT.no);
@@ -64624,7 +64726,7 @@ async function run4(argv, out) {
 }
 var deployCommand = {
   name: "deploy",
-  synopsis: "sokie deploy [dir] [--create [--public] | --server <slug>] [--no-wait] [--site <url>]",
+  synopsis: "sokie deploy [dir] [--create [--public] | --server <slug>] [--no-wait] [--force] [--site <url>]",
   summary: "Deploy the server in dir and wait until it is live.",
   help: `Checks the repository the way the platform will, uploads its definition
 files and waits for the deploy. The first deploy to a site says which server:
@@ -64637,25 +64739,32 @@ After that the repository is linked (in ${LINK_FILE}, kept out of git).
 In CI, set ${DEPLOY_KEY_ENV} to a deploy key from the server's page instead
 of signing in: it deploys that key's server, and nothing is written to disk.
 
+A server with no repository keeps its files on Sokie. In a folder from
+sokie edit, a deploy is refused once production has moved on since the
+files were downloaded (an edit in the app, a restore), so it never undoes
+a change unseen: sokie pull brings that change in first.
+
 --no-wait     Return once the deploy is queued.
+--force       Deploy these files even if production changed since they were downloaded.
 ${SITE_HELP}`,
   run: run4
 };
 
 // src/commands/deploys.ts
 import { resolve as resolve4 } from "node:path";
+import { stdin as stdin3 } from "node:process";
 
 // src/deploy-diff.ts
-var name = (side) => side.previewPr === undefined ? `#${side.number}` : `#${side.number} (preview of PR #${side.previewPr})`;
+var name2 = (side) => side.previewPr === undefined ? `#${side.number}` : `#${side.number} (preview of PR #${side.previewPr})`;
 function diffTitle(view) {
   const { to, from, basis } = view;
   if (!from) {
-    return to.previewPr === undefined ? `#${to.number} is the first production deploy: every tool is new.` : `What ${name(to)} would add: nothing is in production yet.`;
+    return to.previewPr === undefined ? `#${to.number} is the first production deploy: every tool is new.` : `What ${name2(to)} would add: nothing is in production yet.`;
   }
   if (basis === "production")
-    return `What ${name(to)} would change in production (${name(from)}).`;
+    return `What ${name2(to)} would change in production (${name2(from)}).`;
   const why = basis === "previous" ? ", the production deploy before it" : "";
-  return `What ${name(to)} changed, compared with ${name(from)}${why}.`;
+  return `What ${name2(to)} changed, compared with ${name2(from)}${why}.`;
 }
 var SIGN = {
   added: "+",
@@ -64729,7 +64838,223 @@ function diffLines(view) {
   return lines;
 }
 
+// src/deploy-list.ts
+function statusOf(deploy) {
+  if (deploy.status === "failed")
+    return { text: "failed", tone: "fail" };
+  if (deploy.status === "queued" || deploy.status === "building") {
+    return { text: deploy.status, tone: "warn" };
+  }
+  if (deploy.previewPr !== undefined)
+    return { text: "preview", tone: deploy.status === "live" ? "ok" : undefined };
+  return deploy.status === "live" ? { text: "live", tone: "ok" } : { text: "replaced", tone: "dim" };
+}
+function sourceOf(deploy) {
+  if (deploy.restoreOf !== undefined)
+    return `restore of #${deploy.restoreOf}`;
+  const source = deploy.source;
+  if (!source)
+    return "uploaded from the CLI";
+  if (source.kind === "upload") {
+    const edited = source.edited ?? [];
+    if (edited.length > 0) {
+      const named = edited.length <= 2 ? edited.join(" and ") : `${edited[0]} and ${edited.length - 1} more`;
+      return `${named} edited in the app`;
+    }
+    return source.from === "web" ? "made in Sokie from a spec" : "uploaded from the CLI";
+  }
+  const pr = deploy.previewPr ?? source.prNumber;
+  const sha = source.sha.slice(0, 7);
+  return pr === undefined ? `${sha} on ${source.branch}` : `${sha} · preview #${pr}`;
+}
+var MINUTE = 60000;
+var HOUR = 60 * MINUTE;
+var DAY = 24 * HOUR;
+function ago(at2, now) {
+  const gone = Math.max(0, now - at2);
+  if (gone < MINUTE)
+    return "just now";
+  if (gone < HOUR)
+    return `${Math.floor(gone / MINUTE)} min ago`;
+  if (gone < DAY)
+    return `${Math.floor(gone / HOUR)} h ago`;
+  if (gone < 2 * DAY)
+    return "yesterday";
+  if (gone < 30 * DAY)
+    return `${Math.floor(gone / DAY)} days ago`;
+  return new Date(at2).toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric",
+    timeZone: "UTC"
+  });
+}
+function headerLine(slug, facts) {
+  if (facts.pin) {
+    const since = facts.pin.skippedPushes === 1 ? "1 push" : `${facts.pin.skippedPushes} pushes`;
+    return {
+      text: `${slug} · production stays on #${facts.live ?? "?"} until sokie deploys resume (${since} since the restore)`,
+      tone: "warn"
+    };
+  }
+  if (facts.branch)
+    return { text: `${slug} · production follows ${facts.branch}`, tone: "dim" };
+  return { text: `${slug} · Sokie keeps its files`, tone: "dim" };
+}
+function rowLine(deploy, now) {
+  const status = statusOf(deploy);
+  const number4 = deploy.number === undefined ? "—" : `#${deploy.number}`;
+  const text5 = `  ${number4.padEnd(5)} ${status.text.padEnd(9)} ${sourceOf(deploy).padEnd(32)} ${ago(deploy.createdAt, now)}`;
+  return { text: text5, tone: status.tone === "dim" ? undefined : status.tone };
+}
+function listLines2(slug, deploys, facts) {
+  const live = deploys.find((d) => d.status === "live" && d.previewPr === undefined)?.number;
+  const lines = [headerLine(slug, { ...facts, live }), { text: "" }];
+  if (deploys.length === 0) {
+    lines.push({ text: "  No deploys yet. sokie deploy makes the first one.", tone: "dim" });
+    return lines;
+  }
+  for (const deploy of deploys)
+    lines.push(rowLine(deploy, facts.now));
+  if (facts.more) {
+    lines.push({
+      text: `  … older ones too. sokie deploys --limit ${facts.limit * 2} goes further back; --json for scripts.`,
+      tone: "dim"
+    });
+  }
+  return lines;
+}
+function diffTone(line, index) {
+  if (index === 0)
+    return "strong";
+  const sign = line.trimStart().slice(0, 2);
+  if (sign === "+ ")
+    return "ok";
+  if (sign === "- ")
+    return "fail";
+  if (sign === "↑ " || sign === "↓ ")
+    return "warn";
+  return;
+}
+
+// src/deploys-restore.ts
+var REFUSED = {
+  ALREADY_LIVE: (n) => `#${n} is what production runs now. sokie deploys lists the others.`,
+  DEPLOY_NOT_FOUND: (n) => `There is no deploy #${n} on this server.`,
+  NOT_RESTORABLE: (n) => `#${n} never served production: it's a preview, it failed, or it hasn't finished. Only a deploy that went live and was replaced can be restored.`,
+  DEPLOY_IN_PROGRESS: () => "A deploy is running. Try again when it finishes.",
+  MISSING_SECRETS: (n) => `#${n} needs a secret production no longer has.`,
+  PLAN_LIMIT_SERVERS: () => "This server is past your plan's server limit, so it takes no deploys. Delete a server or upgrade on the Billing page.",
+  NOT_PINNED: () => "Production already follows the default branch."
+};
+function refused2(out, error62, n) {
+  const code2 = error62 instanceof ConvexError && typeof error62.data === "string" ? error62.data : "";
+  const say = REFUSED[code2];
+  return say ? fail(out, code2.toLowerCase(), say(n), EXIT.no) : null;
+}
+async function agreed(out, question, yes, deps) {
+  if (yes)
+    return true;
+  if (!deps.interactive || out.json) {
+    return fail(out, "needs_confirmation", "Confirm it in a terminal, or pass --yes.", EXIT.usage);
+  }
+  if (await deps.confirm(question))
+    return true;
+  await out.line("Nothing changed.", "dim");
+  await out.result({ ok: false, error: { code: "declined", message: "Nothing changed." } });
+  return EXIT.no;
+}
+async function restoreDeploy(out, client, server, n, options, deps) {
+  const serverId = server.serverId;
+  try {
+    const check3 = await client.query(fn.restoreCheck, { serverId, number: n });
+    if (check3.refusal)
+      return await refused2(out, new ConvexError(check3.refusal), n) ?? EXIT.no;
+    if (check3.missingSecrets.length > 0) {
+      const names = check3.missingSecrets.join(", ");
+      return fail(out, "missing_secrets", `#${n} reads ${names}, which production doesn't have any more. Set it with sokie secrets set ${check3.missingSecrets[0]}, or restore a later deploy.`, EXIT.no);
+    }
+    const page = await client.query(fn.server, { serverId }).catch(() => null);
+    const live = page?.live?.number;
+    const picked = await client.query(fn.deployByNumber, { serverId, number: n });
+    const from = picked ? ` (${sourceOf(picked)})` : "";
+    await out.line(`Restore #${n}${from} to production${live === undefined ? "" : `, in place of #${live}`}?`, "strong");
+    if (live !== undefined) {
+      const view = await client.action(fn.compareDeploys, { serverId, from: live, to: n }).catch(() => null);
+      if (view) {
+        await out.line();
+        await out.line(`What agents will see, compared with #${live} now:`);
+        const heads = view.diff.tools.map((change) => toolLines(change)[0] ?? "");
+        if (heads.length === 0)
+          await out.line("  Nothing an agent sees would change.", "dim");
+        for (const head of heads)
+          await out.line(`  ${head}`, diffTone(head, 1));
+      }
+    }
+    await out.line();
+    await out.line(`Rebuilt from #${n}'s files on today's runtime, with today's secrets.`);
+    await out.line(check3.pins ? `Production stops following ${check3.branch ?? "the default branch"} until sokie deploys resume.` : `The files go back too: the next edit in the app, or sokie deploy, starts from #${n}'s.`, "warn");
+    const answer = await agreed(out, `Restore #${n}?`, options.yes, deps);
+    if (answer !== true)
+      return answer;
+    const queued = await client.mutation(fn.restore, { serverId, number: n });
+    await out.line(`#${queued.number} · restore of #${n} · building`, "dim");
+    const started = Date.now();
+    const done = await followDeploy({ query: client.query.bind(client), sleep: deps.sleep }, queued.deploymentId, { wait: true });
+    if (done.status === "failed") {
+      const reason = done.error?.message ?? "The restore didn't build.";
+      await out.problem(`✗ ${reason} Production is unchanged.`, "fail");
+      await out.result({
+        ok: false,
+        deploy: done,
+        error: done.error ?? { code: "restore_failed", message: reason }
+      });
+      return EXIT.no;
+    }
+    const took = Math.max(1, Math.round((Date.now() - started) / 1000));
+    await out.line(`#${queued.number} is live in ${took} s · ${server.url ?? server.slug}`, "ok");
+    await out.line("Calls can reach the previous deploy for up to a minute while the edges catch up.", "dim");
+    await out.result({
+      ok: true,
+      server: server.slug,
+      deploy: { number: queued.number, restoreOf: n, status: done.status },
+      pinned: queued.pinned
+    });
+    return EXIT.ok;
+  } catch (error62) {
+    const handled = refused2(out, error62, n);
+    if (handled)
+      return handled;
+    throw error62;
+  }
+}
+async function resumeDeploys(out, client, server, options, deps) {
+  const serverId = server.serverId;
+  try {
+    const page = await client.query(fn.server, { serverId });
+    const pin = page.pin;
+    if (!pin)
+      return fail(out, "not_pinned", "Production already follows the default branch.", EXIT.no);
+    const pushes = pin.skippedPushes === 1 ? "1 push" : `${pin.skippedPushes} pushes`;
+    const newest = pin.lastSkipped ? `: ${pin.lastSkipped.sha.slice(0, 7)} ${pin.lastSkipped.title}` : "";
+    await out.line(`${pushes} since the restore of #${pin.restoreOf}${newest}`);
+    const answer = await agreed(out, "Deploy the default branch and follow it again?", options.yes, deps);
+    if (answer !== true)
+      return answer;
+    const resumed = await client.mutation(fn.resume, { serverId });
+    await out.line(resumed.deploying ? "Production follows the default branch again. Its newest commit is deploying; sokie deploys shows it." : "Production follows the default branch again; the next push deploys.", "ok");
+    await out.result({ ok: true, server: server.slug, deploying: resumed.deploying });
+    return EXIT.ok;
+  } catch (error62) {
+    const handled = refused2(out, error62, 0);
+    if (handled)
+      return handled;
+    throw error62;
+  }
+}
+
 // src/commands/deploys.ts
+var VERBS = ["diff", "restore", "resume", "list"];
+var PAGE = 100;
 var REFUSALS = {
   DEPLOY_NOT_FOUND: (to, from) => `There is no deploy #${from !== undefined ? `${from} or #${to}` : to} on this server.`,
   NOT_BUILT: (to) => `#${to} has no bundle: it failed or is still building. sokie logs or the Deploys tab say why.`,
@@ -64743,22 +65068,82 @@ function deployNumber(raw, what) {
   }
   return number4;
 }
+async function newest(client, serverId, limit) {
+  const deploys = [];
+  let cursor = null;
+  for (;; ) {
+    const page = await client.query(fn.deployments, {
+      serverId,
+      paginationOpts: { numItems: Math.min(PAGE, limit - deploys.length), cursor }
+    });
+    deploys.push(...page.page);
+    if (page.isDone)
+      return { deploys, more: false };
+    if (deploys.length >= limit)
+      return { deploys, more: true };
+    cursor = page.continueCursor;
+  }
+}
+async function listDeploys(out, client, server, limit, now) {
+  const { deploys, more } = await newest(client, server.serverId, limit);
+  const page = await client.query(fn.server, { serverId: server.serverId }).catch(() => null);
+  const link = await client.query(fn.link, { serverId: server.serverId }).catch(() => null);
+  const facts = {
+    ...link && !link.broken ? { branch: link.defaultBranch } : {},
+    ...page?.pin ? { pin: page.pin } : {},
+    now,
+    more,
+    limit
+  };
+  for (const line of listLines2(server.slug, deploys, facts))
+    await out.line(line.text, line.tone);
+  await out.result({
+    ok: true,
+    server: server.slug,
+    deploys,
+    more,
+    ...page?.pin ? { pin: page.pin } : {}
+  });
+  return EXIT.ok;
+}
 async function runDeploys(argv, out, deps) {
   const { values, positionals } = parseCommandArgs(argv, {
     ...SITE_OPTION,
     server: { type: "string" },
-    dir: { type: "string" }
-  });
-  const [verb, ...numbers] = positionals;
-  if (verb !== "diff")
-    throw new UsageError("Say diff: sokie deploys diff [<from>] <to>.");
-  if (numbers.length < 1 || numbers.length > 2) {
-    throw new UsageError("Give the deploy to show, and optionally one to compare it with first.");
+    dir: { type: "string" },
+    limit: { type: "string" },
+    yes: { type: "boolean", default: false }
+  });
+  const [verb = "list", ...numbers] = positionals;
+  if (!VERBS.includes(verb)) {
+    throw new UsageError(`No "${verb}": say diff, restore or resume, or nothing to list deploys.`);
+  }
+  const limit = values.limit === undefined ? 10 : Number(values.limit);
+  if (!Number.isInteger(limit) || limit < 1 || limit > 500) {
+    throw new UsageError("--limit is how many deploys to list, from 1 to 500.");
+  }
+  let to = 0;
+  let from;
+  if (verb === "diff") {
+    if (numbers.length < 1 || numbers.length > 2) {
+      throw new UsageError("Give the deploy to show, and optionally one to compare it with first.");
+    }
+    const [first = "", second] = numbers;
+    to = deployNumber(second ?? first, "<to>");
+    from = second === undefined ? undefined : deployNumber(first, "<from>");
+  } else if (verb === "restore") {
+    if (numbers.length !== 1)
+      throw new UsageError("Give the deploy to restore: sokie deploys restore 11.");
+    to = deployNumber(numbers[0] ?? "", "<n>");
+  } else if (numbers.length > 0) {
+    throw new UsageError(`sokie deploys ${verb === "list" ? "" : `${verb} `}takes no deploy number.`);
   }
-  const [first = "", second] = numbers;
-  const to = deployNumber(second ?? first, "<to>");
-  const from = second === undefined ? undefined : deployNumber(first, "<from>");
   const root = resolve4(values.dir ?? ".");
+  const ask = {
+    interactive: deps.interactive ?? stdin3.isTTY === true,
+    confirm: deps.confirm ?? confirm,
+    sleep: deps.sleep ?? ((ms) => new Promise((done) => setTimeout(done, ms)))
+  };
   return deps.signedIn(out, values.site, async (info2, client) => {
     try {
       const slug = values.server ?? readLink(root, info2.site)?.slug;
@@ -64766,13 +65151,20 @@ async function runDeploys(argv, out, deps) {
         return fail(out, "not_linked", `No server is linked here for ${info2.site}. Pass --server <slug>, or deploy first.`, EXIT.no);
       }
       const server = await serverBySlug(client, slug);
+      if (verb === "list")
+        return await listDeploys(out, client, server, limit, (deps.now ?? Date.now)());
+      if (verb === "restore")
+        return await restoreDeploy(out, client, server, to, { yes: values.yes }, ask);
+      if (verb === "resume")
+        return await resumeDeploys(out, client, server, { yes: values.yes }, ask);
       const view = await client.action(fn.compareDeploys, {
         serverId: server.serverId,
         to,
         ...from === undefined ? {} : { from }
       });
-      for (const line of diffLines(view))
-        await out.line(line);
+      for (const [index, line] of diffLines(view).entries()) {
+        await out.line(line, diffTone(line, index));
+      }
       await out.result({ ok: true, server: server.slug, ...view });
       return EXIT.ok;
     } catch (error62) {
@@ -64788,17 +65180,31 @@ async function runDeploys(argv, out, deps) {
 }
 var deploysCommand = {
   name: "deploys",
-  synopsis: "sokie deploys diff [<from>] <to> [--server <slug>] [--dir <dir>] [--site <url>]",
-  summary: "Show what a deploy changed for agents, tool by tool.",
-  help: `Compares two deploys' bundles, by deploy number, and prints what an agent
-sees differently: tools added, removed or renamed, descriptions, effects
-raised or lowered, input schemas, response projections, operations, the
-server's settings, prompts, resources and the runtime version.
+  synopsis: "sokie deploys [diff [<from>] <to> | restore <n> | resume] [--yes] [--limit <n>] [--server <slug>] [--dir <dir>] [--site <url>]",
+  summary: "List a server's deploys, compare two, or restore an earlier one.",
+  help: `With no verb, lists the newest deploys (--limit, default 10): each one's
+number, status, where its files came from and when, under what production
+follows now.
+
+diff [<from>] <to>
+  Compares two deploys' bundles and prints what an agent sees differently:
+  tools added, removed or renamed, descriptions, effects raised or lowered,
+  input schemas, response projections, operations, the server's settings,
+  prompts, resources and the runtime version. With only <to>, a production
+  deploy is compared with the one that went live before it, a preview with
+  production now, and a first deploy lists every tool it added.
 
-With only <to>, a production deploy is compared with the production deploy
-that went live before it, a preview with production as it is now, and a
-first deploy lists every tool it added. Give <from> to compare any two.
+restore <n>
+  Rebuilds deploy n's files as a new deploy on today's runtime and secrets,
+  after showing what agents would see change and asking. Only a deploy that
+  went live and was replaced can come back. On a server linked to GitHub,
+  production then stops following the default branch: pushes are checked
+  but don't deploy until resume.
 
+resume
+  Deploys the default branch's newest commit and follows it again.
+
+--yes         Restore or resume without asking, for scripts.
 --server <s>  A server by slug, instead of the one this repository is linked to.
 --dir <dir>   The repository (default .), for its link.
 ${SITE_HELP}`,
@@ -64814,7 +65220,7 @@ import { join as join8, resolve as resolve5 } from "node:path";
 import { readFileSync as readFileSync8 } from "node:fs";
 import { createServer } from "node:http";
 import { fileURLToPath } from "node:url";
-var file2 = (name2) => fileURLToPath(new URL(`./inspector/${name2}`, import.meta.url));
+var file2 = (name3) => fileURLToPath(new URL(`./inspector/${name3}`, import.meta.url));
 var STATIC = {
   "/": { file: file2("index.html"), type: "text/html" },
   "/inspector.css": { file: file2("inspector.css"), type: "text/css" },
@@ -64859,13 +65265,13 @@ async function call(req, res, session) {
   if (!fromOwnPage(req))
     return json2(res, 403, { error: "Calls come from the inspector page." });
   const body = await readJson2(req);
-  const name2 = body?.name;
+  const name3 = body?.name;
   const args = body?.arguments ?? {};
-  if (typeof name2 !== "string" || typeof args !== "object" || args === null || Array.isArray(args)) {
+  if (typeof name3 !== "string" || typeof args !== "object" || args === null || Array.isArray(args)) {
     return json2(res, 400, { error: "Send { name, arguments } with arguments as an object." });
   }
   const started = performance.now();
-  const result = await callTool(session.state.serverUrl, session.token, name2, args);
+  const result = await callTool(session.state.serverUrl, session.token, name3, args);
   json2(res, 200, { result, ms: Math.round(performance.now() - started) });
 }
 async function route(req, res, session, port) {
@@ -64905,41 +65311,43 @@ function startInspector(session, host, port) {
 }
 
 // src/dev/report.ts
-function findingLines(findings) {
+function findingLines(findings, tint = plain) {
   const shown = findings.filter((f) => f.level !== "info");
-  const lines = shown.map(findingLine);
+  const lines = shown.map((finding3) => findingLine(finding3, tint));
   const info2 = findings.length - shown.length;
-  if (info2 > 0)
-    lines.push(`· ${plural2(info2, "note")} from the build; sokie check lists them.`);
+  if (info2 > 0) {
+    lines.push(tint("dim", `· ${plural2(info2, "note")} from the build; sokie check lists them.`));
+  }
   return lines;
 }
-function secretLines(state) {
+function secretLines(state, tint = plain) {
   const report = state.secrets;
   if (!report)
     return [];
-  return [
+  const lines = [
     ...report.missing.map((s) => `! ${s.name} has no value in ${DEV_SECRETS_FILE}. ${s.description}`.trim()),
-    ...report.standInsMissing.map((name2) => `! ${name2} is not set in ${DEV_SECRETS_FILE}; tools that call the upstream need it.`),
-    ...report.unknown.map((name2) => `! ${name2} in ${DEV_SECRETS_FILE} is not declared in sokie.json, so it is not bound.`)
+    ...report.standInsMissing.map((name3) => `! ${name3} is not set in ${DEV_SECRETS_FILE}; tools that call the upstream need it.`),
+    ...report.unknown.map((name3) => `! ${name3} in ${DEV_SECRETS_FILE} is not declared in sokie.json, so it is not bound.`)
   ];
+  return lines.map((line) => tint("warn", line));
 }
-function createReporter(write) {
+function createReporter(write, tint = plain) {
   let lastNotes = "";
   let lastRevision = 0;
   return (state) => {
-    const notes = [...findingLines(state.findings), ...secretLines(state)].join(`
+    const notes = [...findingLines(state.findings, tint), ...secretLines(state, tint)].join(`
 `);
     if (notes && notes !== lastNotes)
       write(notes);
     lastNotes = notes;
     if (state.status === "failed") {
-      write(lastRevision > 0 ? "✗ Build failed; the last good build is still serving." : "✗ Build failed; fix the errors above and save.");
+      write(tint("fail", lastRevision > 0 ? "✗ Build failed; the last good build is still serving." : "✗ Build failed; fix the errors above and save."));
       return;
     }
     const first = lastRevision === 0;
     lastRevision = state.revision;
     const what = `${state.name}: ${plural2(state.toolCount, "tool")}, ${state.accessMode}`;
-    write(`${first ? "✓ Running" : "↻ Reloaded"} ${what} (${state.reloadMs}ms)`);
+    write(tint("ok", `${first ? "✓ Running" : "↻ Reloaded"} ${what} (${state.reloadMs}ms)`));
   };
 }
 
@@ -64955,18 +65363,18 @@ async function body(req) {
 }
 function headersOf(req) {
   const headers = new Headers;
-  for (const [name2, value] of Object.entries(req.headers)) {
+  for (const [name3, value] of Object.entries(req.headers)) {
     if (value === undefined)
       continue;
     for (const item of Array.isArray(value) ? value : [value])
-      headers.append(name2, item);
+      headers.append(name3, item);
   }
   return headers;
 }
 async function relay(response, res) {
   const headers = {};
-  response.headers.forEach((value, name2) => {
-    headers[name2] = value;
+  response.headers.forEach((value, name3) => {
+    headers[name3] = value;
   });
   const cookies = response.headers.getSetCookie();
   if (cookies.length > 0)
@@ -65078,7 +65486,7 @@ function answerPlatform(request, path, options) {
   if (path === "/caller-key") {
     const apiKey = options.secret(CALLER_KEY);
     if (!apiKey) {
-      options.log(`! a tool needs your upstream key: set ${CALLER_KEY} in ${DEV_SECRETS_FILE}`);
+      options.log(`! a tool needs your upstream key: set ${CALLER_KEY} in ${DEV_SECRETS_FILE}`, "warn");
       return platformError(404, "caller_key_missing");
     }
     return Response.json({ apiKey });
@@ -65086,7 +65494,7 @@ function answerPlatform(request, path, options) {
   if (path === "/oauth-token") {
     const accessToken2 = options.secret(OAUTH_TOKEN);
     if (!accessToken2) {
-      options.log(`! a tool needs an upstream token: set ${OAUTH_TOKEN} in ${DEV_SECRETS_FILE}`);
+      options.log(`! a tool needs an upstream token: set ${OAUTH_TOKEN} in ${DEV_SECRETS_FILE}`, "warn");
       return platformError(404, "oauth_token_missing");
     }
     return Response.json({ accessToken: accessToken2, tokenType: "Bearer" });
@@ -65102,6 +65510,11 @@ async function forward(request) {
     redirect: "manual"
   });
 }
+function upstreamTone(status) {
+  if (status >= 500)
+    return "fail";
+  return status >= 400 ? "warn" : undefined;
+}
 function outboundHandler(options) {
   return async (request) => {
     const url2 = new URL(request.url);
@@ -65111,11 +65524,11 @@ function outboundHandler(options) {
     const where = `${request.method} ${url2.origin}${url2.pathname}`;
     try {
       const response = await forward(request);
-      options.log(`→ ${where} ${response.status} ${Math.round(performance.now() - started)}ms`);
+      options.log(`→ ${where} ${response.status} ${Math.round(performance.now() - started)}ms`, upstreamTone(response.status));
       return response;
     } catch (error62) {
       const reason = error62 instanceof Error ? error62.message : String(error62);
-      options.log(`✗ ${where} failed: ${reason}`);
+      options.log(`✗ ${where} failed: ${reason}`, "fail");
       throw error62;
     }
   };
@@ -65337,7 +65750,7 @@ class DevSession {
       bindings: this.#bindings(config2, auth2),
       outbound: outboundHandler({
         platformToken: this.#platformToken,
-        secret: (name2) => this.#secrets.values.get(name2) || null,
+        secret: (name3) => this.#secrets.values.get(name3) || null,
         log: this.#options.log
       })
     });
@@ -65419,9 +65832,9 @@ async function run5(argv, out) {
     const message = `${DEV_SECRETS_FILE} is not gitignored, so its secrets could be committed. Add .sokie/ to .gitignore and run sokie dev again.`;
     return fail(out, "secrets_tracked", message, EXIT.no);
   }
-  const log = (line) => void (out.json ? out.event({ type: "log", line }) : out.line(line));
+  const log = (line, tone) => void (out.json ? out.event({ type: "log", line }) : out.line(line, tone));
   const session = new DevSession({ root, host: values.host, port, log });
-  const report = createReporter((text5) => void out.line(text5));
+  const report = createReporter((text5) => void out.line(text5), out.tint);
   session.subscribe((state) => out.json ? void out.event({ type: "build", state }) : report(state));
   const server = await serveWorker(session.fetch, values.host, port);
   await session.start();
@@ -65437,7 +65850,7 @@ async function run5(argv, out) {
   if (session.token)
     await out.line(`  Token      Bearer ${session.token}`);
   await out.line();
-  await out.line("  Watching for edits. Ctrl+C stops.");
+  await out.line("  Watching for edits. Ctrl+C stops.", "dim");
   if (!values["no-open"])
     openInBrowser(urls.inspector);
   let recorded;
@@ -65521,10 +65934,10 @@ function resolveEditor(choice, folder, facts) {
   const words2 = envEditor(facts.env);
   const [command, ...rest] = words2 ?? [];
   if (command) {
-    const name2 = basename(command).replace(/\.(exe|cmd|bat)$/i, "");
+    const name3 = basename(command).replace(/\.(exe|cmd|bat)$/i, "");
     const path = /[\\/]/.test(command) ? command : facts.which(command) ?? command;
     return {
-      kind: WINDOWED.has(name2) ? "window" : "terminal",
+      kind: WINDOWED.has(name3) ? "window" : "terminal",
       label: command,
       command: path,
       args: [...rest, folder]
@@ -65569,8 +65982,8 @@ function planCheckout(options, facts) {
   const here = cloneOf(options.cwd);
   if (here)
     return { kind: "reuse", root: here };
-  const name2 = options.repo.split("/")[1] ?? options.repo;
-  return into(join9(options.cwd, name2), "exists but");
+  const name3 = options.repo.split("/")[1] ?? options.repo;
+  return into(join9(options.cwd, name3), "exists but");
 }
 function serverFolder(root, path) {
   const inside = path.replace(/^\.?\/*|\/+$/g, "");
@@ -65652,6 +66065,77 @@ function cloneRepo(url2, root) {
   });
 }
 
+// src/hosted.ts
+import { existsSync as existsSync10, mkdirSync as mkdirSync6, readdirSync as readdirSync3, rmSync as rmSync2, writeFileSync as writeFileSync7 } from "node:fs";
+import { dirname as dirname6, join as join11 } from "node:path";
+function safePath(path) {
+  return path !== "" && !path.startsWith("/") && !path.includes("\\") && !path.split("/").some((part) => part === "" || part === "." || part === "..");
+}
+async function downloadFiles(client, serverId, number4, fetchFn = (url2) => fetch(url2)) {
+  const signed = await client.query(fn.serverFiles, {
+    serverId,
+    ...number4 === undefined ? {} : { number: number4 }
+  });
+  if (!signed)
+    return null;
+  const response = await fetchFn(signed.url);
+  if (!response.ok) {
+    throw new DeployError("download_failed", `The files couldn't be downloaded (${response.status}).`);
+  }
+  const parsed = await response.json();
+  const files = new Map;
+  for (const [path, text5] of Object.entries(parsed.files ?? {})) {
+    if (typeof text5 === "string" && safePath(path))
+      files.set(path, text5);
+  }
+  return { files, ...signed.number === undefined ? {} : { number: signed.number } };
+}
+function writeFiles(root, files) {
+  for (const [path, text5] of files) {
+    if (!safePath(path))
+      continue;
+    const full = join11(root, path);
+    if (text5 === null) {
+      rmSync2(full, { force: true });
+      continue;
+    }
+    mkdirSync6(dirname6(full), { recursive: true });
+    writeFileSync7(full, text5);
+  }
+}
+function isEmptyDir(path) {
+  return !existsSync10(path) || readdirSync3(path).length === 0;
+}
+function mergeFiles(base, mine, theirs) {
+  const writes = new Map;
+  const merged = [];
+  const paths = [...new Set([...base.keys(), ...mine.keys(), ...theirs.keys()])].sort();
+  for (const path of paths) {
+    const [b, m, t] = [base.get(path), mine.get(path), theirs.get(path)];
+    if (m === t)
+      continue;
+    if (m === b) {
+      writes.set(path, t ?? null);
+      merged.push({ path, how: t === undefined ? "removed" : "theirs" });
+    } else if (t === b) {
+      merged.push({ path, how: "mine" });
+    } else {
+      writes.set(path, t ?? null);
+      if (m !== undefined)
+        writes.set(`${path}.mine`, m);
+      merged.push({ path, how: "both" });
+    }
+  }
+  return { writes, merged };
+}
+function describeFiles(files) {
+  const paths = [...files.keys()];
+  const tools = paths.filter((path) => path.startsWith("tools/")).length;
+  const rest = paths.filter((path) => !path.includes("/"));
+  const parts = [...rest, ...tools > 0 ? [`${tools} ${tools === 1 ? "tool" : "tools"}`] : []];
+  return parts.length <= 1 ? parts[0] ?? "no files" : `${parts.slice(0, -1).join(", ")} and ${parts.at(-1)}`;
+}
+
 // src/commands/edit.ts
 var TERMINAL2 = () => ({
   cwd: process.cwd(),
@@ -65702,39 +66186,66 @@ async function runEdit(argv, out, deps) {
     }
     slug = server.slug;
     const link = await client.query(fn.link, { serverId: server.serverId });
+    let root;
+    let folder;
+    let cloned = false;
     if (!link) {
-      return fail(out, "no_repository", `${slug} isn't linked to a repository, so there's nothing to clone. Its files came from an upload; from the folder you deployed, run \`sokie link <owner/repo> --server ${slug}\` and edit there.`, EXIT.no);
-    }
-    if (link.broken)
-      await out.problem(`Note: the link to ${link.repo} is broken: ${link.broken}`);
-    const checkout = planCheckout({ repo: link.repo, cwd, dir: values.dir }, deps.repo);
-    if (checkout.kind === "conflict") {
-      return fail(out, "dir_in_use", `${checkout.message} Pass --dir <path>.`, EXIT.no);
-    }
-    if (checkout.kind === "clone") {
-      await out.line(`Cloning ${link.repo} into ${checkout.root}…`);
-      if (!await deps.clone(checkout.url, checkout.root)) {
-        return fail(out, "clone_failed", `git couldn't clone ${checkout.url}. Check you can read it on GitHub, or clone it yourself and pass --dir.`, EXIT.no);
+      root = folder = resolve7(cwd, values.dir ?? slug);
+      const here = readLink(folder, info2.site);
+      if (here?.slug === slug) {
+        await out.line(`Using your copy in ${folder}, from #${here.base ?? "?"}. sokie pull brings in what changed since.`);
+      } else {
+        if (!isEmptyDir(folder)) {
+          return fail(out, "dir_in_use", `${folder} isn't empty. Pass --dir <path>.`, EXIT.no);
+        }
+        const got = await (deps.download ?? downloadFiles)(client, server.serverId);
+        if (!got) {
+          return fail(out, "nothing_deployed", `${slug} has no deploy yet, so no files.`, EXIT.no);
+        }
+        writeFiles(folder, got.files);
+        writeLink(folder, info2.site, {
+          serverId: server.serverId,
+          slug,
+          ...got.number === undefined ? {} : { base: got.number }
+        });
+        cloned = true;
+        await out.line(`Downloaded production's files (#${got.number ?? "?"}) to ${folder}: ${describeFiles(got.files)}.`, "ok");
+        await out.line("sokie deploy puts your edits live; sokie link moves the server to GitHub.", "dim");
       }
     } else {
-      await out.line(`Using your clone of ${link.repo} in ${checkout.root}.`);
+      if (link.broken)
+        await out.problem(`Note: the link to ${link.repo} is broken: ${link.broken}`);
+      const checkout = planCheckout({ repo: link.repo, cwd, dir: values.dir }, deps.repo);
+      if (checkout.kind === "conflict") {
+        return fail(out, "dir_in_use", `${checkout.message} Pass --dir <path>.`, EXIT.no);
+      }
+      if (checkout.kind === "clone") {
+        await out.line(`Cloning ${link.repo} into ${checkout.root}…`);
+        if (!await deps.clone(checkout.url, checkout.root)) {
+          return fail(out, "clone_failed", `git couldn't clone ${checkout.url}. Check you can read it on GitHub, or clone it yourself and pass --dir.`, EXIT.no);
+        }
+      } else {
+        await out.line(`Using your clone of ${link.repo} in ${checkout.root}.`);
+      }
+      root = checkout.root;
+      folder = serverFolder(checkout.root, link.path);
+      cloned = checkout.kind === "clone";
+      writeLink(folder, info2.site, { serverId: server.serverId, slug });
     }
-    const folder = serverFolder(checkout.root, link.path);
-    writeLink(folder, info2.site, { serverId: server.serverId, slug });
     ensureIgnored(folder, ".sokie/");
-    const launch = resolveEditor(editor, checkout.root, deps.editors);
-    const opened = launch.kind === "none" ? false : await openEditor(launch, checkout.root, dev, out, deps);
+    const launch = resolveEditor(editor, root, deps.editors);
+    const opened = launch.kind === "none" ? false : await openEditor(launch, root, dev, out, deps);
     if (launch.kind === "none") {
       await out.problem(launch.reason);
-      await out.line(`The folder is ${checkout.root}.`);
+      await out.line(`The folder is ${root}.`);
     }
     const summary = {
       ok: true,
       server: slug,
-      repo: link.repo,
-      dir: checkout.root,
+      repo: link?.repo ?? null,
+      dir: root,
       serverDir: folder,
-      cloned: checkout.kind === "clone",
+      cloned,
       editor: launch.kind === "none" ? null : { kind: launch.kind, command: launch.command, opened },
       dev
     };
@@ -65750,13 +66261,18 @@ async function runEdit(argv, out, deps) {
 var editCommand = {
   name: "edit",
   synopsis: "sokie edit [<server-slug>] [--editor vscode|cursor|zed] [--dir <path>] [--no-dev] [--site <url>]",
-  summary: "Open a server's repository in your editor, with sokie dev running.",
+  summary: "Open a server's files in your editor, with sokie dev running.",
   help: `Finds the repository the server is linked to and uses your clone of it:
 the folder you're in, or --dir. With neither, it clones into ./<name>, as
 git clone would. Then it opens the folder in your editor and runs sokie dev
 in it, reloading on every save. Open a pull request for a preview; merge
 it to the default branch to deploy.
 
+A server with no repository keeps its files on Sokie: they're downloaded
+into ./<slug> (or --dir, which must be empty), and sokie deploy from there
+puts edits live. It won't deploy over a change made in the app since the
+download; sokie pull brings that in first.
+
 With no slug, the server this folder is linked to.
 
 --editor <e>  vscode, cursor or zed, through its command on PATH. Without it,
@@ -65768,15 +66284,15 @@ ${SITE_HELP}`,
 };
 
 // src/commands/fmt.ts
-import { existsSync as existsSync10, readFileSync as readFileSync9, writeFileSync as writeFileSync7 } from "node:fs";
-import { join as join11, resolve as resolve8 } from "node:path";
+import { existsSync as existsSync11, readFileSync as readFileSync9, writeFileSync as writeFileSync8 } from "node:fs";
+import { join as join12, resolve as resolve8 } from "node:path";
 async function run6(argv, out) {
   const { values, positionals } = parseCommandArgs(argv, {
     check: { type: "boolean", default: false }
   });
   const root = resolve8(positionals[0] ?? ".");
-  const path = join11(root, SERVER_CONFIG_FILE);
-  if (!existsSync10(path)) {
+  const path = join12(root, SERVER_CONFIG_FILE);
+  if (!existsSync11(path)) {
     return fail(out, "no_server", `No ${SERVER_CONFIG_FILE} in ${root}.`, EXIT.no);
   }
   const content = readFileSync9(path, "utf8");
@@ -65790,13 +66306,16 @@ async function run6(argv, out) {
   const canonical = canonicalServerJson(raw);
   const formatted = canonical === content;
   if (values.check) {
-    await out.line(formatted ? `${SERVER_CONFIG_FILE} is formatted.` : `${SERVER_CONFIG_FILE} is not formatted. Run sokie fmt.`);
+    if (formatted)
+      await out.line(`${SERVER_CONFIG_FILE} is formatted.`, "ok");
+    else
+      await out.line(`${SERVER_CONFIG_FILE} is not formatted. Run sokie fmt.`, "fail");
     await out.result({ ok: formatted, file: SERVER_CONFIG_FILE, changed: false });
     return formatted ? EXIT.ok : EXIT.no;
   }
   if (!formatted)
-    writeFileSync7(path, canonical);
-  await out.line(formatted ? `${SERVER_CONFIG_FILE} is already formatted.` : `Formatted ${SERVER_CONFIG_FILE}.`);
+    writeFileSync8(path, canonical);
+  await out.line(formatted ? `${SERVER_CONFIG_FILE} is already formatted.` : `Formatted ${SERVER_CONFIG_FILE}.`, "ok");
   await out.result({ ok: true, file: SERVER_CONFIG_FILE, changed: !formatted });
   return EXIT.ok;
 }
@@ -65811,33 +66330,33 @@ the file would change.`,
 };
 
 // src/commands/init.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync8 } from "node:fs";
-import { basename as basename2, dirname as dirname6, extname, join as join12, relative as relative2, resolve as resolve9, sep as sep3 } from "node:path";
-import { stdin as stdin3, stdout } from "node:process";
+import { existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync9 } from "node:fs";
+import { basename as basename2, dirname as dirname7, extname, join as join13, relative as relative2, resolve as resolve9, sep as sep3 } from "node:path";
+import { stdin as stdin4, stdout } from "node:process";
 var FETCH_TIMEOUT_MS = 30000;
 var TERMINAL3 = {
-  interactive: stdin3.isTTY === true && stdout.isTTY === true,
+  interactive: stdin4.isTTY === true && stdout.isTTY === true,
   askSecret: readSecretValue
 };
 function perCaller(auth2) {
   return auth2?.type === "apiKey" && auth2.key === "perCaller";
 }
-async function offerCallerKey(root, name2, out, deps) {
+async function offerCallerKey(root, name3, out, deps) {
   if (readDevSecrets(root).values.get(CALLER_KEY)) {
-    await out.line(`Your key is already in ${DEV_SECRETS_FILE}, so sokie dev has it.`);
+    await out.line(`Your key is already in ${DEV_SECRETS_FILE}, so sokie dev has it.`, "ok");
     return "already_set";
   }
   if (secretsFileTracked(root) === true) {
-    await out.line(`! ${DEV_SECRETS_FILE} is not gitignored, so init didn't ask for your key. Add .sokie/ to .gitignore, then set ${CALLER_KEY} in ${DEV_SECRETS_FILE} for sokie dev.`);
+    await out.line(`! ${DEV_SECRETS_FILE} is not gitignored, so init didn't ask for your key. Add .sokie/ to .gitignore, then set ${CALLER_KEY} in ${DEV_SECRETS_FILE} for sokie dev.`, "warn");
     return "not_set";
   }
-  const key = deps.interactive && !out.json ? (await deps.askSecret(`Your key for ${name2}, for sokie dev (Enter to skip)`)).trim() : "";
+  const key = deps.interactive && !out.json ? (await deps.askSecret(`Your key for ${name3}, for sokie dev (Enter to skip)`)).trim() : "";
   if (!key) {
-    await out.line(`! sokie dev needs your key for ${name2}: set ${CALLER_KEY} in ${DEV_SECRETS_FILE}, which git ignores.`);
+    await out.line(`! sokie dev needs your key for ${name3}: set ${CALLER_KEY} in ${DEV_SECRETS_FILE}, which git ignores.`, "warn");
     return "not_set";
   }
   writeDevSecret(root, CALLER_KEY, key);
-  await out.line(`Saved your key to ${DEV_SECRETS_FILE} for sokie dev (ignored by git).`);
+  await out.line(`Saved your key to ${DEV_SECRETS_FILE} for sokie dev (ignored by git).`, "ok");
   return "saved";
 }
 async function loadSpec(spec) {
@@ -65848,7 +66367,7 @@ async function loadSpec(spec) {
     return { content: await response.text(), url: spec };
   }
   const local = resolve9(spec);
-  if (!existsSync11(local))
+  if (!existsSync12(local))
     throw new Error(`There is no file at ${spec}.`);
   return { content: readFileSync10(local, "utf8"), local };
 }
@@ -65867,8 +66386,8 @@ async function runInit(argv, out, deps) {
   if (!spec)
     throw new UsageError("Name the spec: a file path or an https URL.");
   const root = resolve9(dir);
-  if (existsSync11(join12(root, SERVER_CONFIG_FILE))) {
-    const message = `${join12(dir, SERVER_CONFIG_FILE)} already exists; this is already a server. sokie check reviews it.`;
+  if (existsSync12(join13(root, SERVER_CONFIG_FILE))) {
+    const message = `${join13(dir, SERVER_CONFIG_FILE)} already exists; this is already a server. sokie check reviews it.`;
     return fail(out, "already_initialised", message, EXIT.no);
   }
   let loaded;
@@ -65897,20 +66416,20 @@ async function runInit(argv, out, deps) {
   const copySpec = !loaded.local || relative2(root, loaded.local).startsWith("..");
   if (copySpec)
     plan.files.set(specPath, loaded.content);
-  const taken = [...plan.files.keys()].filter((path) => existsSync11(join12(root, path)));
+  const taken = [...plan.files.keys()].filter((path) => existsSync12(join13(root, path)));
   if (taken.length > 0) {
     const message = `Not overwriting ${taken.slice(0, 3).join(", ")}${taken.length > 3 ? ` and ${taken.length - 3} more` : ""}. Move them aside, or init into an empty directory.`;
     return fail(out, "files_exist", message, EXIT.no);
   }
   const build2 = buildFromFiles(new Map([...plan.files, [specPath, loaded.content]]));
   for (const [path, content] of plan.files) {
-    mkdirSync6(dirname6(join12(root, path)), { recursive: true });
-    writeFileSync8(join12(root, path), content);
+    mkdirSync7(dirname7(join13(root, path)), { recursive: true });
+    writeFileSync9(join13(root, path), content);
   }
   const ignored = ensureIgnored(root, ".sokie/");
   const findings = sortFindings(build2.findings);
-  const name2 = build2.config?.name ?? values.name ?? basename2(root);
-  await out.line(`Created ${name2} in ${dir}:`);
+  const name3 = build2.config?.name ?? values.name ?? basename2(root);
+  await out.line(`Created ${name3} in ${dir}:`, "ok");
   await out.line(`  ${SERVER_CONFIG_FILE}`);
   if (copySpec)
     await out.line(`  ${specPath}${loaded.url ? ` (from ${loaded.url})` : ""}`);
@@ -65918,16 +66437,20 @@ async function runInit(argv, out, deps) {
   if (ignored)
     await out.line("  .gitignore  added .sokie/, where sokie dev keeps local secrets");
   for (const note of plan.notes)
-    await out.line(`! ${note}`);
+    await out.line(`! ${note}`, "warn");
   await out.line();
   for (const finding3 of findings)
-    await out.line(findingLine(finding3));
-  const callerKey = perCaller(read.facts.auth) ? await offerCallerKey(root, name2, out, deps) : undefined;
-  await out.line(build2.bundle ? "Next: read each tool's description and set its risk, then run sokie dev." : "Fix the errors above, then run sokie check.");
+    await out.line(findingLine(finding3, out.tint));
+  const callerKey = perCaller(read.facts.auth) ? await offerCallerKey(root, name3, out, deps) : undefined;
+  if (build2.bundle) {
+    await out.line("Next: read each tool's description and set its risk, then run sokie dev.");
+  } else {
+    await out.line("Fix the errors above, then run sokie check.", "fail");
+  }
   await out.result({
     ok: build2.bundle !== null,
     dir: root,
-    name: name2,
+    name: name3,
     files: [...plan.files.keys(), ...ignored ? [".gitignore"] : []],
     tools: plan.tools,
     notes: plan.notes,
@@ -66132,8 +66655,8 @@ async function run7(argv, out) {
   if (values["no-browser"]) {
     redirectUri = REGISTERED_REDIRECT.replace("127.0.0.1", `127.0.0.1:${PASTE_PORT}`);
     await out.line("Open this address in a browser and approve:");
-    await out.line(authorizeUrl(info2, { clientId, redirectUri, challenge, state }));
-    await out.line("The browser then fails to load a 127.0.0.1 page. That's expected.");
+    await out.line(authorizeUrl(info2, { clientId, redirectUri, challenge, state }), "dim");
+    await out.line("The browser then fails to load a 127.0.0.1 page. That's expected.", "dim");
     const pasted = readCallback(await readLine("Paste the address it landed on:"), state);
     if (!pasted.ok)
       return fail(out, "login_refused", pasted.message, EXIT.no);
@@ -66143,7 +66666,7 @@ async function run7(argv, out) {
     redirectUri = server.redirectUri;
     const url2 = authorizeUrl(info2, { clientId, redirectUri, challenge, state });
     await out.line("Opening your browser to sign in. If it doesn't open, go to:");
-    await out.line(url2);
+    await out.line(url2, "dim");
     openBrowser(url2);
     try {
       ({ code: code2, iss } = await server.wait(state, WAIT_MS3));
@@ -66160,7 +66683,7 @@ async function run7(argv, out) {
   writeCredentials(info2.site, { clientId, ...tokens });
   const me = await (await signedIn(info2)).query(fn.me, {});
   writeCredentials(info2.site, { clientId, ...tokens, email: me.email });
-  await out.line(`Signed in to ${info2.site} as ${me.email}.`);
+  await out.line(`Signed in to ${info2.site} as ${me.email}.`, "ok");
   await out.result({ ok: true, site: info2.site, email: me.email });
   return EXIT.ok;
 }
@@ -66198,7 +66721,7 @@ async function run8(argv, out) {
     revoked = false;
   }
   writeCredentials(site, { clientId: stored.clientId });
-  await out.line(revoked ? `Signed out of ${site}.` : `Signed out here, but ${site} couldn't be reached to end the sign-in. Disconnect it in Settings › Connected apps.`);
+  await out.line(revoked ? `Signed out of ${site}.` : `Signed out here, but ${site} couldn't be reached to end the sign-in. Disconnect it in Settings › Connected apps.`, revoked ? "ok" : "warn");
   await out.result({ ok: true, site, signedOut: true, revoked });
   return EXIT.ok;
 }
@@ -66261,13 +66784,13 @@ async function run9(argv, out) {
       const current = live ? liveLine(live) : null;
       if (!values.follow) {
         for (const entry of [...first].reverse())
-          await out.line(logLine(entry));
+          await out.line(logLine(entry, out.tint));
         if (first.length === 0) {
           const { days: days2 } = await client.query(fn.logRetention, { serverId: server.serverId });
           await out.line(`${server.slug} has no calls in ${lastDays(days2)}.`);
         }
         if (current)
-          await out.line(current);
+          await out.line(current, "dim");
         await out.result({
           ok: true,
           server: server.slug,
@@ -66278,9 +66801,9 @@ async function run9(argv, out) {
       }
       let since = { at: 0, ids: new Set };
       let batch = first;
-      await out.line(`Following ${server.slug}. Ctrl+C stops.`);
+      await out.line(`Following ${server.slug}. Ctrl+C stops.`, "dim");
       if (current)
-        await out.line(current);
+        await out.line(current, "dim");
       for (;; ) {
         const next = unseen(batch, since);
         since = next.since;
@@ -66288,7 +66811,7 @@ async function run9(argv, out) {
           if (out.json)
             await out.event({ type: "call", ...entry });
           else
-            await out.line(logLine(entry));
+            await out.line(logLine(entry, out.tint));
         }
         await sleep2(FOLLOW_EVERY_MS);
         batch = await read(MAX_LIMIT2);
@@ -66321,8 +66844,97 @@ ${SITE_HELP}`,
   run: run9
 };
 
-// src/commands/secrets.ts
+// src/commands/pull.ts
 import { resolve as resolve12 } from "node:path";
+function mergedLine(entry, to) {
+  const path = `  ${entry.path.padEnd(28)}`;
+  switch (entry.how) {
+    case "theirs":
+      return { text: `${path} taken from #${to}` };
+    case "removed":
+      return { text: `${path} removed, as in #${to}` };
+    case "mine":
+      return { text: `${path} yours kept: you changed it, #${to} didn't`, tone: "dim" };
+    case "both":
+      return {
+        text: `${path} changed on both sides, so yours is kept as ${entry.path}.mine`,
+        tone: "warn"
+      };
+  }
+}
+async function runPull(argv, out, deps) {
+  const { values, positionals } = parseCommandArgs(argv, { ...SITE_OPTION });
+  const root = resolve12(positionals[0] ?? ".");
+  const download = deps.download ?? downloadFiles;
+  return deps.signedIn(out, values.site, async (info2, client) => {
+    try {
+      const link = readLink(root, info2.site);
+      if (!link) {
+        return fail(out, "not_linked", `No server is linked here for ${info2.site}. sokie edit <slug> makes a folder to pull into.`, EXIT.no);
+      }
+      const github = await client.query(fn.link, { serverId: link.serverId });
+      if (github) {
+        return fail(out, "has_repository", `${link.slug} deploys from ${github.repo}; git pull brings in its changes.`, EXIT.no);
+      }
+      if (link.base === undefined) {
+        return fail(out, "no_base", `This folder doesn't say which deploy its files came from, so there's nothing to compare. sokie edit ${link.slug} --dir <empty folder> makes a fresh copy.`, EXIT.no);
+      }
+      const theirs = await download(client, link.serverId);
+      if (!theirs || theirs.number === undefined) {
+        return fail(out, "nothing_deployed", `${link.slug} has no deploy to pull.`, EXIT.no);
+      }
+      const to = theirs.number;
+      if (to === link.base) {
+        await out.line(`Up to date with #${to}, production.`, "ok");
+        await out.result({ ok: true, server: link.slug, from: link.base, to, files: [] });
+        return EXIT.ok;
+      }
+      const base = await download(client, link.serverId, link.base);
+      if (!base) {
+        return fail(out, "base_gone", `#${link.base}'s files aren't on Sokie any more.`, EXIT.no);
+      }
+      const mine = (deps.readFiles ?? readRepoFiles)(root);
+      const { writes, merged } = mergeFiles(base.files, mine, theirs.files);
+      writeFiles(root, writes);
+      writeLink(root, info2.site, { ...link, base: to });
+      await out.line(`#${link.base} → #${to}, production`, "strong");
+      for (const entry of merged) {
+        const line = mergedLine(entry, to);
+        await out.line(line.text, line.tone);
+      }
+      const both = merged.filter((entry) => entry.how === "both").length;
+      const yours = merged.some((entry) => entry.how === "mine" || entry.how === "both");
+      await out.line(both > 0 ? `Up to date with #${to}. Compare each .mine file with its file and delete it (sokie check warns while one is left), then sokie deploy.` : `Up to date with #${to}.${yours ? " sokie deploy puts your changes live." : ""}`, both > 0 ? "warn" : "ok");
+      await out.result({ ok: true, server: link.slug, from: link.base, to, files: merged });
+      return EXIT.ok;
+    } catch (error62) {
+      if (error62 instanceof DeployError)
+        return fail(out, error62.code, error62.message, EXIT.no);
+      throw error62;
+    }
+  });
+}
+var pullCommand = {
+  name: "pull",
+  synopsis: "sokie pull [dir] [--site <url>]",
+  summary: "Bring a folder from sokie edit up to date with production.",
+  help: `For a server with no repository, whose files Sokie keeps: brings the
+folder sokie edit made (default .) up to date with what production runs
+now, such as an edit made in the app or a restore, without losing yours.
+
+File by file, from the deploy the folder's files came from: a file only
+production changed is taken, a file only you changed is kept, and a file
+both changed takes production's, with yours kept beside it as <file>.mine.
+sokie deploy refuses files older than production until they're pulled.
+
+A server linked to a repository gets its changes with git pull instead.
+
+${SITE_HELP}`,
+  run: (argv, out) => runPull(argv, out, { signedIn: withSignedIn })
+};
+
+// src/commands/secrets.ts
+import { resolve as resolve13 } from "node:path";
 var LIVE = {
   updated: "The running server has it now.",
   not_deployed: "It's bound at the first deploy.",
@@ -66334,14 +66946,14 @@ async function run10(argv, out) {
     server: { type: "string" },
     dir: { type: "string" }
   });
-  const [verb, name2] = positionals;
+  const [verb, name3] = positionals;
   if (verb !== "list" && verb !== "set" && verb !== "unset") {
     throw new UsageError("Say list, set NAME or unset NAME.");
   }
-  if (verb !== "list" && (!name2 || !SECRET_NAME.test(name2) || name2.startsWith("SOKIE_"))) {
+  if (verb !== "list" && (!name3 || !SECRET_NAME.test(name3) || name3.startsWith("SOKIE_"))) {
     throw new UsageError("Give the secret's name as sokie.json declares it, e.g. TASKS_API_KEY.");
   }
-  const root = resolve12(values.dir ?? ".");
+  const root = resolve13(values.dir ?? ".");
   return withSignedIn(out, values.site, async (info2, client) => {
     try {
       const slug = values.server ?? readLink(root, info2.site)?.slug;
@@ -66363,20 +66975,21 @@ async function run10(argv, out) {
           cursor = page2.continueCursor;
         }
         for (const secret of secrets) {
-          await out.line(`${secret.name}  set ${new Date(secret.updatedAt).toISOString().slice(0, 10)}`);
+          const day = new Date(secret.updatedAt).toISOString().slice(0, 10);
+          await out.line(`${secret.name}  ${out.tint("dim", `set ${day}`)}`);
         }
         if (secrets.length === 0)
           await out.line(`${server.slug} has no secrets set.`);
         await out.result({ ok: true, server: server.slug, secrets });
         return EXIT.ok;
       }
-      const secretName2 = name2 ?? "";
+      const secretName2 = name3 ?? "";
       const result = verb === "set" ? await client.action(fn.setSecret, {
         serverId: server.serverId,
         name: secretName2,
         value: await readSecretValue(`${secretName2} for ${server.slug}`)
       }) : await client.action(fn.removeSecret, { serverId: server.serverId, name: secretName2 });
-      await out.line(`${verb === "set" ? "Set" : "Removed"} ${secretName2} on ${server.slug}. ${LIVE[result.live]}`);
+      await out.line(`${verb === "set" ? "Set" : "Removed"} ${secretName2} on ${server.slug}. ${LIVE[result.live]}`, result.live === "failed" ? "warn" : "ok");
       await out.result({ ok: true, server: server.slug, name: secretName2, live: result.live });
       return EXIT.ok;
     } catch (error62) {
@@ -66401,7 +67014,7 @@ ${SITE_HELP}`,
 };
 
 // src/commands/test.ts
-import { resolve as resolve13 } from "node:path";
+import { resolve as resolve14 } from "node:path";
 
 // src/test-board.ts
 var PASSES_SHOWN = 10;
@@ -66413,15 +67026,15 @@ function columnsFor(cases) {
     tool: Math.min(TOOL_MAX, Math.max(4, ...cases.map((c) => c.tool.length)))
   };
 }
-function caseLines(run11, columns) {
+function caseLines(run11, columns, tint = plain) {
   const mark = run11.verdict.passed ? "✓" : "✕";
   const ms = `${run11.ms} ms`.padStart(8);
   const head = `  ${mark} ${run11.testCase.name.padEnd(columns.name)}  ${run11.testCase.tool.padEnd(columns.tool)}${ms}`;
   if (run11.verdict.passed)
-    return [head];
-  return [head, ...run11.verdict.failures.map((failure) => `      ${failure}`)];
+    return [tint("ok", head)];
+  return [tint("fail", head), ...run11.verdict.failures.map((failure) => `      ${failure}`)];
 }
-function headerLine(running, where, notHere, target) {
+function headerLine2(running, where, notHere, target) {
   const cases = `${running} ${running === 1 ? "case" : "cases"} against ${where}`;
   if (notHere === 0)
     return cases;
@@ -66457,7 +67070,7 @@ function caseTarget(target) {
 async function runCases(out, deps, plan, target, endpointFor, all) {
   const first = await endpointFor();
   const where = target.kind === "dev" ? `sokie dev (${first.url})` : new URL(first.url).host;
-  await out.line(headerLine(plan.cases.length, where, plan.notHere, targetName(target)));
+  await out.line(headerLine2(plan.cases.length, where, plan.notHere, targetName(target)), "dim");
   await out.line();
   const columns = columnsFor(plan.cases);
   const runs = [];
@@ -66483,16 +67096,16 @@ async function runCases(out, deps, plan, target, endpointFor, all) {
     if (run11.verdict.passed && show)
       shownPasses += 1;
     if (show)
-      for (const line of caseLines(run11, columns))
+      for (const line of caseLines(run11, columns, out.tint))
         await out.line(line);
   }
   const passed = runs.filter((run11) => run11.verdict.passed).length;
   const failed = runs.length - passed;
   const hidden = hiddenLine(passed - shownPasses);
   if (hidden)
-    await out.line(hidden);
+    await out.line(hidden, "dim");
   await out.line();
-  await out.line(summaryLine2(passed, failed));
+  await out.line(summaryLine2(passed, failed), failed === 0 ? "ok" : "fail");
   await out.result({
     ok: failed === 0,
     target: targetName(target),
@@ -66520,7 +67133,7 @@ async function runTest(argv, out, deps) {
   if (target.kind === "dev" && values.server !== undefined) {
     throw new UsageError("--server picks a deploy: add --preview <n> or --production.");
   }
-  const root = resolve13(values.dir ?? ".");
+  const root = resolve14(values.dir ?? ".");
   const { definition } = buildFromFiles(readRepoFiles(root));
   if (!definition) {
     const message = "This repository has errors, so its cases can't be read. sokie check lists them.";
@@ -66599,35 +67212,35 @@ ${SITE_HELP}`,
 };
 
 // src/commands/tools.ts
-import { resolve as resolve14 } from "node:path";
+import { resolve as resolve15 } from "node:path";
 async function run11(argv, out) {
   const { values, positionals } = parseCommandArgs(argv, {
     dir: { type: "string" },
     all: { type: "boolean", default: false },
     unexposed: { type: "boolean", default: false }
   });
-  const [verb, name2, ...extra] = positionals;
+  const [verb, name3, ...extra] = positionals;
   if (verb !== undefined && verb !== "show") {
     throw new UsageError(`Say show <name>, or nothing to list them; "${verb}" isn't one.`);
   }
-  if (verb === "show" && (!name2 || extra.length > 0)) {
+  if (verb === "show" && (!name3 || extra.length > 0)) {
     throw new UsageError("Give one tool's name: sokie tools show list_invoices.");
   }
   if (verb === "show" && (values.all || values.unexposed)) {
     throw new UsageError("--all and --unexposed are for the list, not show.");
   }
-  const files = readRepoFiles(resolve14(values.dir ?? "."));
+  const files = readRepoFiles(resolve15(values.dir ?? "."));
   const build2 = buildFromFiles(files);
   const { bundle, config: config2, definition } = build2;
   if (!bundle || !config2 || !definition)
     return notBuildable(out, build2);
   const rows = toolRows(definition, build2.findings);
   const { unexposed } = build2;
-  if (name2 !== undefined)
-    return show(out, rows, name2, definition, bundle);
+  if (name3 !== undefined)
+    return show(out, rows, name3, definition, bundle);
   if (values.unexposed)
     return listUnexposed(out, unexposed);
-  for (const line of listLines(rows, unexposed.length, values.all))
+  for (const line of listLines(rows, unexposed.length, values.all, out.tint))
     await out.line(line);
   await out.result({ ok: true, server: bundle.name, tools: rows, unexposed: unexposed.length });
   return EXIT.ok;
@@ -66635,20 +67248,20 @@ async function run11(argv, out) {
 async function notBuildable(out, build2) {
   const errors5 = sortFindings(build2.findings).filter((finding3) => finding3.level === "error");
   for (const finding3 of errors5)
-    await out.line(findingLine(finding3));
+    await out.line(findingLine(finding3, out.tint));
   if (errors5.length > 0)
     await out.line();
   return fail(out, "not_buildable", `${plural2(errors5.length, "error")} ${errors5.length === 1 ? "stops" : "stop"} this repository from building, so its tools can't be read. sokie check lists everything.`, EXIT.no);
 }
-async function show(out, rows, name2, definition, bundle) {
-  const row = rows.find((candidate) => candidate.name === name2);
+async function show(out, rows, name3, definition, bundle) {
+  const row = rows.find((candidate) => candidate.name === name3);
   if (!row) {
-    const near = rows.find((candidate) => candidate.name.toLowerCase() === name2.toLowerCase());
+    const near = rows.find((candidate) => candidate.name.toLowerCase() === name3.toLowerCase());
     const hint = near ? ` Did you mean ${near.name}?` : " sokie tools lists them.";
-    return fail(out, "unknown_tool", `No tool named ${name2} in tools/.${hint}`, EXIT.no);
+    return fail(out, "unknown_tool", `No tool named ${name3} in tools/.${hint}`, EXIT.no);
   }
   const tool = toolDetail(row, definition, bundle);
-  for (const line of detailLines(tool))
+  for (const line of detailLines(tool, out.tint))
     await out.line(line);
   await out.result({ ok: true, tool });
   return EXIT.ok;
@@ -66656,7 +67269,7 @@ async function show(out, rows, name2, definition, bundle) {
 async function listUnexposed(out, unexposed) {
   const graphql = unexposed.length > 0 && unexposed.every((op) => /^(?:query|mutation) /.test(op.operation));
   if (unexposed.length === 0) {
-    await out.line("Every operation in the spec has a tool, or is marked x-mcp: false.");
+    await out.line("Every operation in the spec has a tool, or is marked x-mcp: false.", "ok");
   } else {
     await out.line(`${plural2(unexposed.length, "operation")} in the spec with no tool:`);
     await out.line();
@@ -66665,7 +67278,7 @@ async function listUnexposed(out, unexposed) {
       await out.line(`  ${op.operation.padEnd(width)}tools/${op.name}.md`);
     }
     await out.line();
-    await out.line(graphql ? "Add the file to expose one. A GraphQL field without a file stays out of the server." : "Add the file to expose one, or mark it x-mcp: false in the spec.");
+    await out.line(graphql ? "Add the file to expose one. A GraphQL field without a file stays out of the server." : "Add the file to expose one, or mark it x-mcp: false in the spec.", "dim");
   }
   await out.result({ ok: true, unexposed });
   return EXIT.ok;
@@ -66686,12 +67299,251 @@ show <name>   One tool: its annotations, its inputs from the spec, and each
   run: run11
 };
 
+// src/commands/update.ts
+import { spawn as spawn4 } from "node:child_process";
+
+// src/update/install.ts
+import { realpathSync } from "node:fs";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+
+// src/update/version.ts
+function channelFor(version4) {
+  return version4.includes("-staging.") ? "staging" : "latest";
+}
+var SEMVER = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/;
+function parseVersion(version4) {
+  const match = SEMVER.exec(version4.trim());
+  if (!match)
+    return null;
+  const [, major, minor, patch, pre] = match;
+  return {
+    core: [Number(major), Number(minor), Number(patch)],
+    pre: pre ? pre.split(".").map((part) => /^\d+$/.test(part) ? Number(part) : part) : []
+  };
+}
+function compareIdentifiers(a, b) {
+  if (typeof a === "number" && typeof b === "number")
+    return Math.sign(a - b);
+  if (typeof a === "number")
+    return -1;
+  if (typeof b === "number")
+    return 1;
+  return a < b ? -1 : a > b ? 1 : 0;
+}
+function compareVersions(a, b) {
+  for (let i2 = 0;i2 < 3; i2++) {
+    const diff2 = Math.sign((a.core[i2] ?? 0) - (b.core[i2] ?? 0));
+    if (diff2 !== 0)
+      return diff2;
+  }
+  if (a.pre.length === 0 || b.pre.length === 0)
+    return Math.sign(b.pre.length - a.pre.length);
+  for (let i2 = 0;i2 < Math.min(a.pre.length, b.pre.length); i2++) {
+    const diff2 = compareIdentifiers(a.pre[i2] ?? 0, b.pre[i2] ?? 0);
+    if (diff2 !== 0)
+      return diff2;
+  }
+  return Math.sign(a.pre.length - b.pre.length);
+}
+function isNewer(candidate, current) {
+  const a = parseVersion(candidate);
+  const b = parseVersion(current);
+  return a !== null && b !== null && compareVersions(a, b) > 0;
+}
+
+// src/update/install.ts
+function bundlePath(url2 = import.meta.url) {
+  const path = fileURLToPath2(url2);
+  try {
+    return realpathSync(path);
+  } catch {
+    return path;
+  }
+}
+function installerFor(path) {
+  const at2 = path.replaceAll("\\", "/");
+  if (at2.includes("/_npx/"))
+    return "npx";
+  if (at2.includes("/.bun/install/cache/") || /\/bunx-[^/]*\//.test(at2))
+    return "bunx";
+  if (at2.includes("/.bun/"))
+    return "bun";
+  if (/\/\.?pnpm\//.test(at2))
+    return "pnpm";
+  if (/\/yarn\/(data\/)?global\//i.test(at2))
+    return "yarn";
+  return "npm";
+}
+function isRunner(installer) {
+  return installer === "npx" || installer === "bunx";
+}
+function installCommand(manager, tag) {
+  const spec = tag ? `${name}@${tag}` : name;
+  switch (manager) {
+    case "bun":
+      return ["bun", "add", "--global", spec];
+    case "pnpm":
+      return ["pnpm", "add", "--global", spec];
+    case "yarn":
+      return ["yarn", "global", "add", spec];
+    case "npm":
+      return ["npm", "install", "--global", spec];
+  }
+}
+function runnerCommand(runner, tag) {
+  return `${runner} ${name}@${tag}`;
+}
+function changelogUrl(site) {
+  return `${site.replace(/\/+$/, "")}/changelog`;
+}
+var REGISTRY = "https://registry.npmjs.org";
+async function fetchLatest(channel, fetchFn, signal) {
+  const url2 = `${REGISTRY}/-/package/${name.replace("/", "%2f")}/dist-tags`;
+  const response = await fetchFn(url2, { signal, headers: { accept: "application/json" } });
+  if (!response.ok)
+    throw new Error(`npm answered ${response.status}.`);
+  const tags = await response.json();
+  const latest = typeof tags === "object" && tags !== null ? tags[channel] : null;
+  if (typeof latest !== "string" || !parseVersion(latest)) {
+    throw new Error(`npm has no ${channel} version of ${name}.`);
+  }
+  return latest;
+}
+
+// src/commands/update.ts
+var FETCH_MS = 5000;
+function runInstall(command, args, json3) {
+  return new Promise((resolve16, reject) => {
+    const child = spawn4(command, args, {
+      stdio: ["inherit", json3 ? 2 : "inherit", "inherit"],
+      shell: process.platform === "win32"
+    });
+    child.on("error", reject);
+    child.on("close", (code2) => resolve16(code2 ?? 1));
+  });
+}
+var TERMINAL5 = {
+  current: version,
+  site: DEFAULT_SITE,
+  bundlePath: () => bundlePath(),
+  fetch,
+  spawn: runInstall
+};
+async function failWith(out, facts, code2, message) {
+  await out.problem(`✗ ${message}`, "fail");
+  await out.result({ ok: false, ...facts, updated: false, error: { code: code2, message } });
+  return EXIT.no;
+}
+async function fromRunner(out, facts, runner, check3) {
+  const { channel, current } = facts;
+  const manager = runner === "bunx" ? "bun" : "npm";
+  const install = installCommand(manager, channel === "latest" ? undefined : channel).join(" ");
+  const message = `${runner} runs a cached copy of sokie (${current}), so there's nothing to update in place.`;
+  await out.line(`sokie ${facts.latest} is out. ${message}`, "warn");
+  await out.line("To run the newest:");
+  await out.line(`  ${runnerCommand(runner, channel)}`, "dim");
+  await out.line("To install it, so sokie is the newest from then on:");
+  await out.line(`  ${install}`, "dim");
+  if (check3) {
+    await out.result({ ok: true, ...facts, updated: false });
+    return EXIT.ok;
+  }
+  await out.result({
+    ok: false,
+    ...facts,
+    updated: false,
+    error: { code: "cached_copy", message }
+  });
+  return EXIT.no;
+}
+async function install(out, deps, facts, manager) {
+  const [command = manager, ...args] = installCommand(manager, facts.channel);
+  const typed = [command, ...args].join(" ");
+  await out.line(`sokie ${facts.current} → ${facts.latest}. It was installed with ${manager}, so this runs:`);
+  await out.line(`  ${typed}`, "dim");
+  let failure;
+  try {
+    const code2 = await deps.spawn(command, args, out.json);
+    if (code2 === 0) {
+      await out.line(`Updated to ${facts.latest}. What's new: ${changelogUrl(deps.site)}`, "ok");
+      await out.result({ ok: true, ...facts, updated: true });
+      return EXIT.ok;
+    }
+    failure = `${manager} didn't finish (exit code ${code2})`;
+  } catch (error62) {
+    failure = `Couldn't run ${manager} (${error62 instanceof Error ? error62.message : String(error62)})`;
+  }
+  const message = `${failure}, so sokie is still ${facts.current}. Run it yourself: ${typed}`;
+  return failWith(out, facts, "install_failed", message);
+}
+function registryProblem(error62) {
+  if (!(error62 instanceof Error))
+    return String(error62);
+  if (error62.name === "TimeoutError")
+    return `npm didn't answer within ${FETCH_MS / 1000} seconds.`;
+  const code2 = error62.cause?.code;
+  return code2 ? `${error62.message} (${code2})` : error62.message;
+}
+async function runUpdate(argv, out, deps) {
+  const { values, positionals } = parseCommandArgs(argv, {
+    check: { type: "boolean", default: false }
+  });
+  if (positionals.length > 0) {
+    throw new UsageError("sokie update takes no names; --check only says what it would do.");
+  }
+  const { current } = deps;
+  const channel = channelFor(current);
+  const installer = installerFor(deps.bundlePath());
+  let latest;
+  try {
+    latest = await fetchLatest(channel, deps.fetch, AbortSignal.timeout(FETCH_MS));
+  } catch (error62) {
+    const message = `Couldn't ask npm for the newest sokie: ${registryProblem(error62)}`;
+    return failWith(out, { current, latest: null, channel, installer }, "registry_unreachable", message);
+  }
+  const facts = { current, latest, channel, installer };
+  if (!isNewer(latest, current)) {
+    await out.line(`${current} is the newest. Nothing to do.`, "ok");
+    await out.result({ ok: true, ...facts, updated: false });
+    return EXIT.ok;
+  }
+  if (isRunner(installer))
+    return fromRunner(out, facts, installer, values.check);
+  if (values.check) {
+    await out.line(`sokie ${current} → ${latest} is out. It was installed with ${installer}, so sokie update runs:`, "warn");
+    await out.line(`  ${installCommand(installer, channel).join(" ")}`, "dim");
+    await out.result({ ok: true, ...facts, updated: false });
+    return EXIT.ok;
+  }
+  return install(out, deps, facts, installer);
+}
+var updateCommand = {
+  name: "update",
+  synopsis: "sokie update [--check]",
+  summary: "Install the newest sokie, the way this one was installed.",
+  help: `Asks npm for the newest sokie and installs it with the package manager that
+installed this one (npm, bun, pnpm or yarn), as the same global install you
+would type. It never adds sudo: when the install fails, it prints the command
+to run yourself. A copy npx or bunx ran is a cached one, so there is nothing
+to update in place; it says how to get the newest instead. A staging build
+follows npm's staging tag rather than latest.
+
+After a command at a terminal, sokie says when a newer version is out, at
+most once per terminal session. It waits on npm for a moment at most, and
+stays quiet in CI, when stderr isn't a terminal, and under --json, which
+gets one {"update": {...}} line on stderr instead.
+SOKIE_NO_UPDATE_NOTIFIER=1 turns it off.
+
+--check   Only say whether there is a newer version; install nothing.`,
+  run: (argv, out) => runUpdate(argv, out, TERMINAL5)
+};
+
 // src/commands/whoami.ts
 async function run12(argv, out) {
   const { values } = parseCommandArgs(argv, SITE_OPTION);
   return withSignedIn(out, values.site, async (info2, client) => {
     const me = await client.query(fn.me, {});
-    await out.line(`${me.email} on ${info2.site}`);
+    await out.line(`${me.email} on ${info2.site}`, "ok");
     await out.result({ ok: true, site: info2.site, email: me.email, userId: me.userId });
     return EXIT.ok;
   });
@@ -66716,6 +67568,7 @@ var COMMANDS = [
   fmtCommand,
   devCommand,
   editCommand,
+  pullCommand,
   loginCommand,
   logoutCommand,
   whoamiCommand,
@@ -66725,15 +67578,16 @@ var COMMANDS = [
   secretsCommand,
   logsCommand,
   auditCommand,
-  configCommand
+  configCommand,
+  updateCommand
 ];
 
 // src/output.ts
 function writeAll(stream, text5) {
   if (stream.destroyed || stream.writableEnded)
     return Promise.resolve();
-  return new Promise((resolve15) => {
-    stream.write(text5, () => resolve15());
+  return new Promise((resolve16) => {
+    stream.write(text5, () => resolve16());
   });
 }
 function ignoreClosedPipe(stream) {
@@ -66747,12 +67601,15 @@ function ignoreClosedPipe(stream) {
 function createOutput(json3, stdout2 = process.stdout, stderr2 = process.stderr) {
   ignoreClosedPipe(stdout2);
   ignoreClosedPipe(stderr2);
+  const outColor = !json3 && colorFor(stdout2);
+  const errColor = !json3 && colorFor(stderr2);
   return {
     json: json3,
-    line: (text5 = "") => json3 ? Promise.resolve() : writeAll(stdout2, `${text5}
+    line: (text5 = "", tone) => json3 ? Promise.resolve() : writeAll(stdout2, `${paint(outColor, tone, text5)}
 `),
-    problem: (text5) => json3 ? Promise.resolve() : writeAll(stderr2, `${text5}
+    problem: (text5, tone) => json3 ? Promise.resolve() : writeAll(stderr2, `${paint(errColor, tone, text5)}
 `),
+    tint: (tone, text5) => paint(outColor, tone, text5),
     result: (value) => json3 ? writeAll(stdout2, `${JSON.stringify(value, null, 2)}
 `) : Promise.resolve(),
     event: (value) => json3 ? writeAll(stdout2, `${JSON.stringify(value)}
@@ -66762,6 +67619,176 @@ function createOutput(json3, stdout2 = process.stdout, stderr2 = process.stderr)
   };
 }
 
+// src/update/notice.ts
+import { existsSync as existsSync13, mkdirSync as mkdirSync8, readFileSync as readFileSync11, writeFileSync as writeFileSync10 } from "node:fs";
+import { dirname as dirname8, join as join14 } from "node:path";
+
+// src/update/session.ts
+import { execFile } from "node:child_process";
+import { basename as basename3 } from "node:path";
+var RUNNER_PROCESSES = new Set(["node", "npm", "npx", "bun", "bunx", "sh"]);
+var MAX_HOPS = 4;
+function shellAbove(ppid, table) {
+  const parents = new Map;
+  for (const line of table.split(`
+`)) {
+    const match = /^\s*(\d+)\s+(\d+)\s+(\S+)/.exec(line);
+    if (match) {
+      parents.set(Number(match[1]), { parent: Number(match[2]), name: basename3(match[3] ?? "") });
+    }
+  }
+  let pid = ppid;
+  for (let hop = 0;hop < MAX_HOPS; hop++) {
+    const row = parents.get(pid);
+    if (!row || !RUNNER_PROCESSES.has(row.name) || row.parent <= 1)
+      return pid;
+    pid = row.parent;
+  }
+  return pid;
+}
+function processTable() {
+  return new Promise((resolve16, reject) => {
+    execFile("ps", ["-A", "-o", "pid=,ppid=,comm="], { timeout: 300 }, (error62, stdout2) => error62 ? reject(error62) : resolve16(stdout2));
+  });
+}
+async function terminalSession(runner, ppid = process.ppid, table = processTable) {
+  if (runner === null || process.platform === "win32")
+    return ppid;
+  try {
+    return shellAbove(ppid, await table());
+  } catch {
+    return ppid;
+  }
+}
+
+// src/update/notice.ts
+var HOUR_MS = 60 * 60 * 1000;
+function fileStore2(path = join14(configDir(), "update-check.json")) {
+  return {
+    read: () => {
+      try {
+        if (!existsSync13(path))
+          return null;
+        const raw = JSON.parse(readFileSync11(path, "utf8"));
+        if (typeof raw.latest !== "string" || typeof raw.checkedAt !== "number")
+          return null;
+        return {
+          checkedAt: raw.checkedAt,
+          channel: raw.channel === "staging" ? "staging" : "latest",
+          latest: raw.latest,
+          shownForSession: typeof raw.shownForSession === "number" ? raw.shownForSession : null
+        };
+      } catch {
+        return null;
+      }
+    },
+    write: (cache) => {
+      mkdirSync8(dirname8(path), { recursive: true });
+      writeFileSync10(path, JSON.stringify(cache));
+    }
+  };
+}
+function terminalDeps() {
+  const installer = installerFor(bundlePath());
+  const runner = isRunner(installer) ? installer : null;
+  return {
+    current: version,
+    site: DEFAULT_SITE,
+    env: process.env,
+    stderrIsTTY: process.stderr.isTTY === true,
+    runner,
+    session: () => terminalSession(runner),
+    now: Date.now,
+    fetch,
+    store: fileStore2(),
+    graceMs: 400,
+    budgetMs: 1500
+  };
+}
+var set2 = (value) => value !== undefined && value !== "";
+function checkWanted(command, json3, deps) {
+  if (command === "update")
+    return false;
+  const ci = deps.env.CI;
+  if (set2(ci) && ci !== "false" && ci !== "0")
+    return false;
+  if (set2(deps.env.SOKIE_NO_UPDATE_NOTIFIER))
+    return false;
+  return json3 || deps.stderrIsTTY;
+}
+function noticeLines2(latest, deps) {
+  const whatsNew = changelogUrl(deps.site);
+  if (deps.runner) {
+    const get = runnerCommand(deps.runner, channelFor(deps.current));
+    return [
+      {
+        text: `sokie ${latest} is out; ${deps.runner} ran a cached ${deps.current}.`,
+        tone: "warn"
+      },
+      { text: `${get} gets it · what's new: ${whatsNew}`, tone: "dim" }
+    ];
+  }
+  return [
+    { text: `sokie ${latest} is out; you have ${deps.current}. Run sokie update.`, tone: "warn" },
+    { text: `What's new: ${whatsNew}`, tone: "dim" }
+  ];
+}
+async function look(json3, deps, signal) {
+  const channel = channelFor(deps.current);
+  const cached2 = deps.store.read();
+  const session = await deps.session();
+  if (!json3 && cached2?.shownForSession === session)
+    return null;
+  if (cached2 && cached2.channel === channel && deps.now() - cached2.checkedAt < HOUR_MS) {
+    return { latest: cached2.latest, session, cache: cached2 };
+  }
+  const budget = AbortSignal.any([signal, AbortSignal.timeout(deps.budgetMs)]);
+  const latest = await fetchLatest(channel, deps.fetch, budget);
+  const cache = {
+    checkedAt: deps.now(),
+    channel,
+    latest,
+    shownForSession: cached2?.shownForSession ?? null
+  };
+  deps.store.write(cache);
+  return { latest, session, cache };
+}
+function within(answer, ms) {
+  return new Promise((resolve16) => {
+    const timer = setTimeout(() => resolve16(null), ms);
+    answer.then((value) => {
+      clearTimeout(timer);
+      resolve16(value);
+    });
+  });
+}
+var IDLE = { finish: async () => {}, cancel: () => {} };
+function startUpdateCheck(command, json3, deps = terminalDeps()) {
+  if (!checkWanted(command, json3, deps))
+    return IDLE;
+  const controller = new AbortController;
+  const answer = look(json3, deps, controller.signal).catch(() => null);
+  return {
+    cancel: () => controller.abort(),
+    finish: async (out) => {
+      const found = await within(answer, deps.graceMs);
+      controller.abort();
+      if (!found || !isNewer(found.latest, deps.current))
+        return;
+      try {
+        if (out.json) {
+          const update = { current: deps.current, latest: found.latest, command: "sokie update" };
+          await out.aside({ update });
+          return;
+        }
+        for (const line of noticeLines2(found.latest, deps))
+          await out.problem(line.text, line.tone);
+        deps.store.write({ ...found.cache, shownForSession: found.session });
+      } catch {}
+    }
+  };
+}
+
 // src/main.ts
 var usage = () => [
   "Usage: sokie <command> [--json]",
@@ -66779,25 +67806,26 @@ ${command.help}`;
 async function main(argv) {
   const { json: json3, rest } = splitGlobalFlags(argv);
   const out = createOutput(json3);
-  const [name2, ...args] = rest;
-  if (name2 === "--version" || name2 === "-v") {
+  const red = (text5) => paint(!json3 && colorFor(process.stderr), "fail", text5);
+  const [name3, ...args] = rest;
+  if (name3 === "--version" || name3 === "-v") {
     await out.line(version);
     await out.result({ ok: true, version });
     return EXIT.ok;
   }
-  if (!name2 || name2 === "help" || name2 === "--help" || name2 === "-h") {
+  if (!name3 || name3 === "help" || name3 === "--help" || name3 === "-h") {
     const target = COMMANDS.find((command2) => command2.name === args[0]);
     await writeAll(process.stdout, `${target ? helpFor(target) : usage()}
 `);
-    return name2 ? EXIT.ok : EXIT.usage;
+    return name3 ? EXIT.ok : EXIT.usage;
   }
-  const command = COMMANDS.find((candidate) => candidate.name === name2);
+  const command = COMMANDS.find((candidate) => candidate.name === name3);
   if (!command) {
-    await writeAll(process.stderr, `sokie: no command "${name2}".
+    await writeAll(process.stderr, `${red(`sokie: no command "${name3}".`)}
 
 ${usage()}
 `);
-    await out.result({ ok: false, error: { code: "usage", message: `No command "${name2}".` } });
+    await out.result({ ok: false, error: { code: "usage", message: `No command "${name3}".` } });
     return EXIT.usage;
   }
   if (args.includes("--help") || args.includes("-h")) {
@@ -66805,12 +67833,16 @@ ${usage()}
 `);
     return EXIT.ok;
   }
+  const update = startUpdateCheck(command.name, json3);
   try {
-    return await command.run(args, out);
+    const code2 = await command.run(args, out);
+    await update.finish(out);
+    return code2;
   } catch (error62) {
+    update.cancel();
     if (!(error62 instanceof UsageError))
       throw error62;
-    await writeAll(process.stderr, `sokie ${command.name}: ${error62.message}
+    await writeAll(process.stderr, `${red(`sokie ${command.name}: ${error62.message}`)}
 
 Usage: ${command.synopsis}
 `);