querysub 0.684.0 → 0.687.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.684.0",
+  "version": "0.687.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/machineApplyMainCode.ts

@@ -483,21 +483,21 @@ let cachedConfigs: ServiceConfig[] | undefined;
 let cachedConfigsTime = 0;
 // Set when something tells us the configs actually changed, which no interval can predict
 let configRefreshRequested = false;
-async function getResyncConfigs(): Promise<{ configs: ServiceConfig[]; refreshed: boolean }> {
+async function getResyncConfigs(machineId: string): Promise<{ configs: ServiceConfig[]; refreshed: boolean }> {
     let force = configRefreshRequested;
     if (!force && cachedConfigs && Date.now() - cachedConfigsTime < CONFIG_REFRESH_INTERVAL) {
         return { configs: cachedConfigs, refreshed: false };
     }
     // Cleared before the read, so a change arriving DURING it is not swallowed by our own success
     configRefreshRequested = false;
-    cachedConfigs = await getEffectiveServiceConfigs();
+    cachedConfigs = await getEffectiveServiceConfigs(machineId);
     cachedConfigsTime = Date.now();
     return { configs: cachedConfigs, refreshed: true };
 }
 
 const resyncServicesBase = runInSerial(measureWrap(async function resyncServices() {
     let machineId = getOwnMachineId(getDomain());
-    let { configs: allConfigs, refreshed } = await getResyncConfigs();
+    let { configs: allConfigs, refreshed } = await getResyncConfigs(machineId);
     if (refreshed) {
         console.log(magenta("Resyncing services, with freshly read configs"));
     }

package/src/deployManager/machineSchema.ts

@@ -329,6 +329,7 @@ export class MachineServiceControllerBase {
     }
     public async setMachineConfig(machineId: string, config: MachineConfig) {
         await machineConfigs.set(machineId, config);
+        void this.notifyMachines([machineId], []);
     }
 
     private async notifyMachines(newMachineIds: string[], oldMachineIds: string[]) {
@@ -589,22 +590,19 @@ export class MachineServiceControllerBase {
     }
 }
 
-export async function getEffectiveServiceConfigs(): Promise<ServiceConfig[]> {
+/** The service configs as `machineId` should see them. The machine's own config is a modifier on top: a disabled machine sees every service as not deployed, so it takes them down through the ordinary undeploy path instead of needing a second way to stop things. */
+export async function getEffectiveServiceConfigs(machineId: string): Promise<ServiceConfig[]> {
     let configs = await serviceConfigs.values();
-    let allMachineConfigs = await machineConfigs.values();
-
-    let disabledMachineIds = new Set<string>();
-    for (let machineConfig of allMachineConfigs) {
-        if (machineConfig.disabled) {
-            disabledMachineIds.add(machineConfig.machineId);
-        }
-    }
+    let machineConfig = await machineConfigs.get(machineId);
+    let disabled = machineConfig?.disabled;
 
     return configs.map(config => {
         normalizeServiceConfig(config);
-        setMachineTargets(config.parameters, getMachineTargets(config.parameters).filter(target => !disabledMachineIds.has(target.machineId)));
-        if (config.oldParameters) {
-            setMachineTargets(config.oldParameters, getMachineTargets(config.oldParameters).filter(target => !disabledMachineIds.has(target.machineId)));
+        if (disabled) {
+            config.parameters.deploy = false;
+            if (config.oldParameters) {
+                config.oldParameters.deploy = false;
+            }
         }
         return config;
     });

package/src/diagnostics/logs/errorTickets/TicketPage.tsx

@@ -32,6 +32,7 @@ const COMMENT_TEXTAREA_COLLAPSED_HEIGHT = 40;
 export const STATE_HUES: Record<TicketState, number> = {
     "investigation": 45,
     "code-change": 210,
+    "manual-fix-required": 20,
     "fixed": 120,
     "not-a-bug": 280,
     "confused": 330,
@@ -331,9 +332,6 @@ class TicketDetail extends qreact.Component<{ ticketId: string }> {
 
         let sortedComments = [...ticket.comments];
         sort(sortedComments, x => -x.time);
-        // Chronological, because patches on the same file build on each other in the order they were proposed.
-        let patchComments = ticket.comments.filter(c => c.kind === "patch" && c.patchFiles);
-        sort(patchComments, x => x.time);
         return <div className={css.vbox(16).pad2(16).fillBoth.maxWidth("100%").minHeight(0)}>
             <div className={css.hbox(16).alignItems("center")}>
                 <ATag values={[ticketIdURL.getOverride("")]}>← All Tickets</ATag>
@@ -411,21 +409,6 @@ class TicketDetail extends qreact.Component<{ ticketId: string }> {
             <div className={css.vbox(12).fillWidth.flexGrow(1).minHeight(0).overflowAuto}>
                 <div className={css.hbox(16).alignItems("center")}>
                     <h3 className={css.margin(0)}>Comments ({sortedComments.length})</h3>
-                    {patchComments.length > 0 && (
-                        <Button
-                            hue={120}
-                            onClick={() => {
-                                let ticketId = this.props.ticketId;
-                                let commentIds = patchComments.map(c => c.id);
-                                Querysub.onCommitFinished(async () => {
-                                    await getController().applyPatches.promise(ticketId, commentIds);
-                                    resetTicketData();
-                                });
-                            }}
-                        >
-                            Apply All Patches ({patchComments.length})
-                        </Button>
-                    )}
                 </div>
                 {sortedComments.map(comment => (
                     <TicketCommentItem key={comment.id} ticketId={this.props.ticketId} comment={comment} />
@@ -661,6 +644,22 @@ class TicketCommentItem extends qreact.Component<{
                 >
                     Delete
                 </Button>
+                {comment.kind === "patch" && comment.patchFiles && (
+                    <Button
+                        hue={120}
+                        flavor="small"
+                        onClick={() => {
+                            let ticketId = this.props.ticketId;
+                            let commentId = comment.id;
+                            Querysub.onCommitFinished(async () => {
+                                await getController().applyPatches.promise(ticketId, [commentId]);
+                                resetTicketData();
+                            });
+                        }}
+                    >
+                        Apply Patch
+                    </Button>
+                )}
                 {searchInfo && (
                     <>
                         <span className={css.fontSize(12).whiteSpace("nowrap")}>{searchInfo.rangeText}</span>

package/src/diagnostics/logs/errorTickets/autoFixer.ts

@@ -399,11 +399,11 @@ Query syntax (case-insensitive substring match by default):
     },
     {
         name: "setTicketState",
-        description: `Set the state of the ticket you are investigating. Use "code-change" once you have proposed patches, "not-a-bug" if the error should simply be ignored, or "confused" if you genuinely cannot figure out what is going on.`,
+        description: `Set the state of the ticket you are investigating. Use "code-change" once you have proposed patches, "manual-fix-required" if you know what is wrong but cannot express the fix as a patch, "not-a-bug" if the error should simply be ignored, or "confused" if you genuinely cannot figure out what is going on.`,
         inputSchema: {
             type: "object",
             properties: {
-                state: { type: "string", enum: ["code-change", "not-a-bug", "confused"] },
+                state: { type: "string", enum: ["code-change", "manual-fix-required", "not-a-bug", "confused"] },
             },
             required: ["state"],
         },
@@ -504,8 +504,8 @@ async function callTool(toolName: string, args: Record<string, unknown>): Promis
             result = await getNodeInfos();
         } else if (toolName === "setTicketState") {
             let state = String(args.state ?? "") as TicketState;
-            if (state !== "code-change" && state !== "not-a-bug" && state !== "confused") {
-                throw new Error(`setTicketState only allows "code-change", "not-a-bug", or "confused"`);
+            if (state !== "code-change" && state !== "manual-fix-required" && state !== "not-a-bug" && state !== "confused") {
+                throw new Error(`setTicketState only allows "code-change", "manual-fix-required", "not-a-bug", or "confused"`);
             }
             let service = await ticketService();
             await service.setTicketState(ticketId, state);
@@ -673,7 +673,7 @@ PHASE 2 — FIX. Only after you have added your diagnosis comment, decide on the
   3. Gathering more information: if you could NOT determine the root cause from the available logs, propose patches that ADD logging statements to the relevant code paths so the next investigation has the information it needs.
 Each patch file entry is { file, oldText, newText }: oldText must be copied exactly from the current file contents and should be unique within the file; it is replaced with newText. An empty oldText creates a new file. Relative file paths are resolved against the application repository (${process.cwd()}) first, then against the querysub repository (${QUERYSUB_ROOT}) — whichever contains the file. Absolute paths also work. Keep patches minimal and follow the style of the surrounding code.
 
-When you are done, call mcp__autofixer__setTicketState with "code-change" if you proposed patches, or "not-a-bug" if the error should simply be ignored without any code change. If you are confused and just cannot figure out what is going on — the logs and code don't add up, and you can't even propose useful additional logging — add a comment explaining what you tried and what confused you, then call mcp__autofixer__setTicketState with "confused". Do NOT edit files directly — only propose changes through mcp__autofixer__addPatch.
+When you are done, call mcp__autofixer__setTicketState with "code-change" if you proposed patches, or "not-a-bug" if the error should simply be ignored without any code change. If you diagnosed the problem but the fix cannot be expressed as a patch — it needs a design decision, a change outside these repositories, or manual intervention on a machine — add a comment saying exactly what a human has to do, then call mcp__autofixer__setTicketState with "manual-fix-required". If you are confused and just cannot figure out what is going on — the logs and code don't add up, and you can't even propose useful additional logging — add a comment explaining what you tried and what confused you, then call mcp__autofixer__setTicketState with "confused". Do NOT edit files directly — only propose changes through mcp__autofixer__addPatch.
 
 ==== TICKET ====
 Title: ${ticket.title}

package/src/diagnostics/logs/errorTickets/ticketTypes.ts

@@ -1,7 +1,7 @@
 import { LogDatum } from "../diskLogger";
 
-export type TicketState = "investigation" | "code-change" | "fixed" | "not-a-bug" | "confused" | "timed-out";
-export const TICKET_STATES: TicketState[] = ["investigation", "code-change", "fixed", "not-a-bug", "confused", "timed-out"];
+export type TicketState = "investigation" | "code-change" | "manual-fix-required" | "fixed" | "not-a-bug" | "confused" | "timed-out";
+export const TICKET_STATES: TicketState[] = ["investigation", "code-change", "manual-fix-required", "fixed", "not-a-bug", "confused", "timed-out"];
 
 export const TICKET_FINAL_STATES: TicketState[] = ["fixed", "not-a-bug"];
 export function isTicketFinished(state: TicketState): boolean {