apexrest 1.2.0 → 1.3.0

package/dist/codex-compat/plugins/apexrest-apex/runtime/{chunk-2ZUNLCLK.mjs → chunk-QKYF6N6U.mjs}

@@ -1,21 +1,22 @@
 import { createRequire as __createRequire } from 'node:module'; const require = __createRequire(import.meta.url);
 import {
+  JobService,
   dispatch,
   schemas,
+  settleInlineJobs,
+  shutdownOracle,
   toolCatalog
-} from "./chunk-TXVQLYTH.mjs";
-import {
-  panelDocument
-} from "./chunk-AQZLLQ3D.mjs";
-import {
-  JobService
-} from "./chunk-BD2AVCFU.mjs";
+} from "./chunk-5PCC7GZM.mjs";
 import {
   ArtifactService
-} from "./chunk-4MYHJ2IU.mjs";
+} from "./chunk-TMSMKVRP.mjs";
 import {
   VERSION
-} from "./chunk-S24BD6PY.mjs";
+} from "./chunk-RBJJNQ5O.mjs";
+import {
+  loadProject,
+  parse
+} from "./chunk-N4C2SKCN.mjs";
 import {
   AjvJsonSchemaValidator,
   CallToolRequestSchema,
@@ -29,14 +30,12 @@ import {
   InitializeRequestSchema,
   InitializedNotificationSchema,
   LATEST_PROTOCOL_VERSION,
-  ListResourcesRequestSchema,
   ListRootsResultSchema,
   ListToolsRequestSchema,
   LoggingLevelSchema,
   McpError,
   Protocol,
   ReadBuffer,
-  ReadResourceRequestSchema,
   SUPPORTED_PROTOCOL_VERSIONS,
   SetLevelRequestSchema,
   assertClientRequestTaskCapability,
@@ -44,19 +43,17 @@ import {
   external_exports,
   getLiteralValue,
   getObjectShape,
-  loadProject,
   mergeCapabilities,
-  parse,
   safeParse,
   serializeMessage
-} from "./chunk-3MDDJFXN.mjs";
+} from "./chunk-JYN3YHP3.mjs";
 import {
   Fault,
   failure,
   hash,
   sanitized,
   success
-} from "./chunk-2Z3BZF66.mjs";
+} from "./chunk-WPS3CSQJ.mjs";
 
 // node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js
 var ExperimentalServerTasks = class {
@@ -717,8 +714,16 @@ import { fileURLToPath } from "node:url";
 // packages/mcp/src/output.ts
 var inlineLimit = 8192;
 var readerLimit = 32768;
-var panelResultKey = "apexrest/panelResult";
 var archives = /* @__PURE__ */ new Map();
+var pruneIntervalMs = 36e5;
+var pruned = /* @__PURE__ */ new Map();
+async function pruneArchives(service, project, now = Date.now()) {
+  const last = pruned.get(project);
+  if (last !== void 0 && now - last < pruneIntervalMs) return;
+  pruned.set(project, now);
+  if (pruned.size > 32) pruned.delete(pruned.keys().next().value);
+  await service.prune("results").catch(() => void 0);
+}
 function preview(value, depth = 0) {
   if (Array.isArray(value)) return { count: value.length };
   if (!value || typeof value !== "object") return typeof value === "string" ? value.slice(0, 400) : value;
@@ -747,25 +752,65 @@ function preview(value, depth = 0) {
     "scope",
     "compiler",
     "approval",
-    "backupRequired"
+    "backupRequired",
+    "mode",
+    "backupStrategy",
+    "syncId",
+    "revision",
+    "exportedAt",
+    "dirty",
+    "blocked",
+    "blockedReason",
+    "serverFreshness",
+    "backupId",
+    "importingRunId",
+    "phase",
+    "runner",
+    "planId",
+    "planDigest",
+    "planPath",
+    "runId",
+    "warningCount"
   ]) {
     const entry = data[key];
     if (["string", "number", "boolean"].includes(typeof entry))
       result[key] = typeof entry === "string" ? entry.slice(0, 400) : entry;
   }
-  for (const key of ["jobs", "deployments", "diagnostics", "artifacts", "verification"])
+  for (const key of ["sync", "jobs", "deployments", "diagnostics", "artifacts", "verification"])
     if (Array.isArray(data[key])) result[key + "Count"] = data[key].length;
   if (Array.isArray(data.diagnostics))
-    result.diagnostics = data.diagnostics.slice(0, 2).map(
+    result.diagnostics = data.diagnostics.slice(0, 5).map(
       (entry) => entry && typeof entry === "object" ? Object.fromEntries(
-        ["severity", "code", "message", "file"].filter((key) => typeof entry[key] === "string").map((key) => [key, entry[key].slice(0, key === "message" ? 300 : 120)])
+        ["severity", "code", "message", "file", "line", "column", "type", "hint"].filter((key) => ["string", "number"].includes(typeof entry[key])).map((key) => [key, typeof entry[key] === "string" ? entry[key].slice(0, 600) : entry[key]])
       ) : String(entry).slice(0, 300)
     );
+  for (const key of ["application", "grant", "verification", "sources"])
+    if (data[key] && typeof data[key] === "object" && JSON.stringify(data[key]).length <= 1200)
+      result[key] = data[key];
+  if (Array.isArray(data.phases) && JSON.stringify(data.phases).length <= 1200) result.phases = data.phases;
   for (const key of ["artifacts", "nextActions", "risks"])
     if (Array.isArray(data[key])) {
       result[key] = data[key].slice(0, 4).map((entry) => String(entry).slice(0, 200));
       result[key + "Omitted"] = Math.max(0, data[key].length - 4);
     }
+  for (const key of ["connections", "permissions", "changes", "toolchain"])
+    if (data[key] && typeof data[key] === "object") {
+      const value2 = data[key];
+      if (JSON.stringify(value2).length <= 1200) result[key] = value2;
+      else if (key === "connections") result.connections = { count: Object.keys(value2).length };
+      else if (key === "permissions")
+        result.permissions = {
+          activeGrantCount: Array.isArray(value2.activeGrants) ? value2.activeGrants.length : 0
+        };
+      else if (key === "changes")
+        result.changes = {
+          status: value2.status,
+          fileCount: Array.isArray(value2.files) ? value2.files.length : 0
+        };
+    }
+  if (data.lastSuccessfulImport && typeof data.lastSuccessfulImport === "object")
+    result.lastSuccessfulImport = data.lastSuccessfulImport;
+  if (data.workingCopy && typeof data.workingCopy === "object") result.workingCopy = data.workingCopy;
   if (depth < 2 && data.result && typeof data.result === "object")
     result.result = preview(data.result, depth + 1);
   if (data.operation === "deploy.plan" && data.data && depth < 2) result.data = preview(data.data, depth + 1);
@@ -797,20 +842,16 @@ function preview(value, depth = 0) {
 async function toolOutput(original, project) {
   const full = sanitized(original);
   const serialized = JSON.stringify(full);
-  const panel = full.operation.startsWith("panel.");
-  const reader = ["docs.read", "artifacts.read"].includes(full.operation);
+  const reader = ["docs.read", "artifacts.read", "reference"].includes(full.operation);
   let result = full;
   if (serialized.length > (reader ? readerLimit : inlineLimit)) {
     let artifactId;
     let capturedRunId;
-    let recoveryError;
     try {
       if (!project) throw new Error("No project is available for a local result artifact.");
       const service = new ArtifactService(await loadProject(project));
-      const stable = { ...full, runId: "" };
-      if (full.operation === "panel.status" && full.data && typeof full.data === "object")
-        stable.data = { ...full.data, updatedAt: "" };
-      const key = hash(project + JSON.stringify(stable));
+      await pruneArchives(service, project);
+      const key = hash(project + JSON.stringify({ ...full, runId: "" }));
       const cached = archives.get(key);
       if (cached && await service.read(cached.artifactId, 0, 1).then(
         () => true,
@@ -824,16 +865,17 @@ async function toolOutput(original, project) {
         if (archives.size > 32) archives.delete(archives.keys().next().value);
       }
     } catch {
-      recoveryError = "The complete result could not be archived. Inspect the existing local operation record; do not rerun a completed operation.";
+      artifactId = void 0;
     }
     result = {
       ...full,
       summary: full.summary.slice(0, 600),
-      diagnostics: full.diagnostics.slice(0, 5).map((d) => ({ severity: d.severity, code: d.code.slice(0, 100), message: d.message.slice(0, 400) })),
+      diagnostics: full.diagnostics.slice(0, 5),
       artifacts: artifactId ? [artifactId] : [],
-      nextActions: artifactId ? [
-        "For omitted details, use apexrest_artifact_read with output.artifactId and the same project. Follow nextOffset as needed; do not repeat the operation."
-      ] : [recoveryError],
+      nextActions: [
+        ...full.nextActions.slice(0, 3),
+        artifactId ? "For omitted details, use apexrest_artifact_read with output.artifactId and the same project. Follow nextOffset as needed; do not repeat the operation." : "The complete result could not be archived. Inspect the existing local operation record; do not rerun a completed operation."
+      ],
       data: {
         ...preview(full.data),
         output: {
@@ -848,7 +890,7 @@ async function toolOutput(original, project) {
     if (JSON.stringify(result).length > inlineLimit) {
       const data = result.data;
       result.data = Object.fromEntries(
-        ["id", "jobId", "status", "ok", "output"].filter((key) => data[key] !== void 0).map((key) => [key, data[key]])
+        ["id", "jobId", "status", "phase", "ok", "output"].filter((key) => data[key] !== void 0).map((key) => [key, data[key]])
       );
       if (data.result && typeof data.result === "object") {
         const nested = data.result;
@@ -856,17 +898,19 @@ async function toolOutput(original, project) {
           ["id", "ok", "status", "exitCode", "operation", "summary"].filter((field) => ["string", "number", "boolean"].includes(typeof nested[field])).map((field) => [field, nested[field]])
         );
       }
+      if (JSON.stringify(result).length > inlineLimit)
+        result.diagnostics = result.diagnostics.map((d) => ({ ...d, message: d.message.slice(0, 400) }));
     }
   }
   return {
     isError: !result.ok,
-    content: [{ type: "text", text: result === full ? serialized : JSON.stringify(result) }],
-    ...panel ? { _meta: { [panelResultKey]: full } } : {}
+    content: [{ type: "text", text: result === full ? serialized : JSON.stringify(result) }]
   };
 }
 
 // packages/mcp/src/job-tools.ts
 var jobWaitSeconds = external_exports.number().int().min(0).max(30).default(25).describe("Wait for the result or return the existing jobId; default 25 seconds, 0 queues immediately.");
+var shipWaitSeconds = external_exports.number().int().min(0).max(120).default(25).describe("Wait for the result or return the existing jobId; default 25 seconds, 0 queues immediately.");
 var completedResultSchema = external_exports.object({
   schemaVersion: external_exports.literal(1),
   ok: external_exports.boolean(),
@@ -879,8 +923,23 @@ var completedResultSchema = external_exports.object({
       severity: external_exports.enum(["error", "warning", "info"]),
       code: external_exports.string(),
       message: external_exports.string(),
-      file: external_exports.string().optional()
-    }).transform(({ file, ...diagnostic }) => ({ ...diagnostic, ...file !== void 0 ? { file } : {} }))
+      file: external_exports.string().optional(),
+      line: external_exports.number().int().optional(),
+      column: external_exports.number().int().optional(),
+      type: external_exports.string().optional(),
+      hint: external_exports.string().optional(),
+      validValues: external_exports.array(external_exports.string()).optional()
+    }).transform(({ severity, code, message, file, line, column, type, hint, validValues }) => ({
+      severity,
+      code,
+      message,
+      ...file !== void 0 ? { file } : {},
+      ...line !== void 0 ? { line } : {},
+      ...column !== void 0 ? { column } : {},
+      ...type !== void 0 ? { type } : {},
+      ...hint !== void 0 ? { hint } : {},
+      ...validValues !== void 0 ? { validValues } : {}
+    }))
   ),
   artifacts: external_exports.array(external_exports.string()),
   nextActions: external_exports.array(external_exports.string()),
@@ -896,15 +955,28 @@ var completedResultSchema = external_exports.object({
   ])
 });
 function jobToolResult(operation, job) {
-  if (job.status === "completed") {
+  const active = job.status === "queued" || job.status === "running" ? job.status : void 0;
+  if (!active && job.result !== void 0) {
     const nested = completedResultSchema.safeParse(job.result);
     if (nested.success && nested.data.operation === operation) return { ...nested.data, data: job };
   }
-  const nextActions = typeof job.nextAction === "string" ? [job.nextAction] : ["Read apexrest_job_status with this jobId; inspect the existing operation before any retry."];
-  if (job.status === "queued" || job.status === "running")
+  const nextActions = typeof job.nextAction === "string" ? [job.nextAction] : ["Read apexrest_job action:status with this jobId; inspect the existing operation before any retry."];
+  if (job.status === "completed") {
+    const result2 = failure(
+      operation,
+      new Fault(
+        "JOB_RESULT_UNREADABLE",
+        "The job completed but its recorded result cannot be read for this operation. Inspect its existing record; do not repeat the operation.",
+        1,
+        "completed_unreadable"
+      )
+    );
+    return { ...result2, nextActions, data: job };
+  }
+  if (active)
     return {
       ...success(operation, job, `Job ${job.status}; use the existing jobId to retrieve its result.`),
-      status: job.status,
+      status: active,
       nextActions
     };
   const status = job.status === "failed" || job.status === "cancelled" ? job.status : "outcome_unknown";
@@ -919,12 +991,12 @@ function jobToolResult(operation, job) {
   );
   return { ...result, nextActions, data: job };
 }
-async function runJobTool(jobs, operation, input, runtime, signal) {
+async function runJobTool(jobs, operation, input, runtime, signal, options = {}) {
   const { waitSeconds: requestedWait, ...domainInput } = input;
-  const waitSeconds = parse(jobWaitSeconds, requestedWait);
+  const waitSeconds = parse(options.waitSchema ?? jobWaitSeconds, requestedWait);
   if (signal?.aborted)
     throw new Fault("CANCELLED", "Request cancelled before starting a job.", 6, "cancelled");
-  const started = await jobs.start(operation, domainInput, runtime);
+  const started = options.inline ? await options.inline(operation, domainInput) : await jobs.start(operation, domainInput, runtime);
   if (waitSeconds === 0) return started;
   try {
     const state = await jobs.status(started.jobId, waitSeconds, signal);
@@ -939,77 +1011,55 @@ async function runJobTool(jobs, operation, input, runtime, signal) {
     return {
       ...started,
       status: "outcome_unknown",
-      nextAction: "Read apexrest_job_status with this jobId; do not repeat the operation. No cancellation or rollback is confirmed."
+      nextAction: "Read apexrest_job action:status with this jobId; do not repeat the operation. No cancellation or rollback is confirmed."
     };
   }
 }
 
 // packages/mcp/src/server.ts
-var panelUri = "ui://apexrest/development-panel.html";
 var absoluteProject = external_exports.string().min(1).max(4096).refine(
   (value) => path.isAbsolute(value) && (process.platform !== "win32" || /^(?:[A-Za-z]:[\\/]|[\\/]{2}[^\\/]+[\\/][^\\/]+)/.test(value)),
   "Provide the absolute project directory containing apexrest.json; the plugin runs from its installation directory."
 ).describe("Absolute project directory containing apexrest.json; never the plugin cache.");
+var projectOptional = /* @__PURE__ */ new Set(["reference", "status", "project"]);
 var mcpSchemas = /* @__PURE__ */ new Map();
 for (const { operation, long } of toolCatalog) {
   const schema = schemas[operation];
-  const transportSchema = "project" in schema.shape ? schema.extend({ project: operation === "doctor" ? absoluteProject.optional() : absoluteProject }) : schema;
-  mcpSchemas.set(operation, long ? transportSchema.extend({ waitSeconds: jobWaitSeconds }) : transportSchema);
-}
-async function startMcp() {
-  const server = new Server(
-    { name: "apexrest-apex", version: VERSION },
-    { capabilities: { tools: {}, resources: {} } }
+  const transportSchema = "project" in schema.shape ? schema.extend({
+    project: projectOptional.has(operation) ? absoluteProject.optional() : absoluteProject
+  }) : schema;
+  const boundarySchema = operation === "project" ? transportSchema.extend({
+    directory: absoluteProject.describe("Absolute directory for init.").optional(),
+    passwordFile: absoluteProject.describe("Absolute private password file.").optional()
+  }) : transportSchema;
+  mcpSchemas.set(
+    operation,
+    long ? boundarySchema.extend({ waitSeconds: operation === "ship" ? shipWaitSeconds : jobWaitSeconds }) : boundarySchema
   );
-  server.setRequestHandler(ListResourcesRequestSchema, async () => ({
-    resources: [
-      {
-        uri: panelUri,
-        name: "APEXREST development panel",
-        mimeType: "text/html;profile=mcp-app",
-        description: "Codex project settings and APEX operation status."
-      }
-    ]
+}
+function listTools() {
+  return toolCatalog.map((t) => ({
+    name: t.name,
+    description: t.description,
+    inputSchema: external_exports.toJSONSchema(mcpSchemas.get(t.operation), { target: "draft-7", io: "input" }),
+    annotations: {
+      readOnlyHint: t.readOnly,
+      destructiveHint: t.destructive ?? false,
+      idempotentHint: t.readOnly,
+      openWorldHint: t.openWorld ?? false
+    }
   }));
-  server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-    if (request.params.uri !== panelUri) throw new Error("Unknown resource.");
-    return {
-      contents: [
-        {
-          uri: panelUri,
-          mimeType: "text/html;profile=mcp-app",
-          text: await panelDocument(),
-          _meta: { ui: { prefersBorder: true, csp: { connectDomains: [], resourceDomains: [] } } }
-        }
-      ]
-    };
-  });
+}
+function detachedJob(operation, input) {
+  const tool = toolCatalog.find((t) => t.operation === operation);
+  if (tool?.worker) return true;
+  return operation === "test.run" && input.suite !== "unit";
+}
+async function startMcp() {
+  const server = new Server({ name: "apexrest-apex", version: VERSION }, { capabilities: { tools: {} } });
   let catalog;
-  server.setRequestHandler(
-    ListToolsRequestSchema,
-    async () => catalog ??= {
-      tools: toolCatalog.map((t) => ({
-        name: t.name,
-        description: t.description,
-        ...t.operation === "panel.open" ? { _meta: { ui: { resourceUri: panelUri } } } : {},
-        inputSchema: external_exports.toJSONSchema(mcpSchemas.get(t.operation), { target: "draft-7", io: "input" }),
-        annotations: {
-          readOnlyHint: t.readOnly,
-          destructiveHint: t.destructive ?? !t.readOnly,
-          idempotentHint: t.readOnly,
-          openWorldHint: ![
-            "doctor",
-            "docs.search",
-            "docs.read",
-            "project.inspect",
-            "jobs.status",
-            "jobs.cancel",
-            "artifacts.read"
-          ].includes(t.operation)
-        }
-      }))
-    }
-  );
+  const runtime = path.join(path.dirname(fileURLToPath(import.meta.url)), "apexrest.mjs");
+  server.setRequestHandler(ListToolsRequestSchema, async () => catalog ??= { tools: listTools() });
   server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
     const tool = toolCatalog.find((t) => t.name === request.params.name);
     let result;
@@ -1018,24 +1068,72 @@ async function startMcp() {
       if (!tool) throw new Fault("UNKNOWN_TOOL", "Tool is not in the catalog.", 2);
       const input = parse(mcpSchemas.get(tool.operation), request.params.arguments ?? {});
       project = typeof input.project === "string" ? input.project : void 0;
-      result = tool.long ? jobToolResult(
-        tool.operation,
-        await runJobTool(
-          new JobService(await loadProject(String(input.project))),
-          tool.operation,
-          input,
-          path.join(path.dirname(fileURLToPath(import.meta.url)), "apexrest.mjs"),
-          extra.signal
-        )
-      ) : await dispatch(tool.operation, input, extra.signal);
+      const localSync = tool.operation === "apex.sync" && input.action === "status";
+      const planOnly = tool.operation === "ship" && input.mode !== "apply";
+      if (localSync || planOnly) delete input.waitSeconds;
+      if (tool.long && !localSync && !planOnly) {
+        const jobs = new JobService(await loadProject(String(input.project)));
+        if (tool.operation === "ship") {
+          const { waitSeconds, ...domainInput } = input;
+          const planned = await dispatch("ship", { ...domainInput, mode: "plan" }, extra.signal);
+          if (!planned.ok) result = planned;
+          else {
+            const planPath = planned.data.planPath;
+            const job = await runJobTool(
+              jobs,
+              "ship.apply",
+              {
+                project: input.project,
+                env: input.env,
+                plan: planPath,
+                userRequest: input.userRequest,
+                waitSeconds
+              },
+              runtime,
+              extra.signal,
+              { waitSchema: shipWaitSeconds }
+            );
+            result = jobToolResult("ship.apply", job);
+            result = {
+              ...result,
+              operation: "ship",
+              data: { ...result.data, plan: planned.data }
+            };
+          }
+        } else {
+          const inline = detachedJob(tool.operation, input) ? void 0 : (operation, domainInput) => jobs.startInline(
+            operation,
+            domainInput,
+            (op, args, signal, progress) => dispatch(op, args, signal, progress)
+          );
+          result = jobToolResult(
+            tool.operation,
+            await runJobTool(jobs, tool.operation, input, runtime, extra.signal, inline ? { inline } : {})
+          );
+        }
+      } else result = await dispatch(tool.operation, input, extra.signal);
     } catch (e) {
       result = failure(tool?.operation ?? "unknown", e);
     }
     return toolOutput(result, project);
   });
-  await server.connect(new StdioServerTransport());
+  const transport = new StdioServerTransport();
+  const shutdown = async () => {
+    await settleInlineJobs();
+    await shutdownOracle();
+  };
+  for (const signal of ["SIGTERM", "SIGINT"])
+    process.once(signal, () => {
+      void shutdown().finally(() => process.exit(0));
+    });
+  await server.connect(transport);
+  server.onclose = () => {
+    void shutdown().finally(() => process.exit(0));
+  };
 }
-
 export {
+  detachedJob,
+  listTools,
+  mcpSchemas,
   startMcp
 };

package/dist/codex-compat/plugins/apexrest-apex/runtime/{chunk-S24BD6PY.mjs → chunk-RBJJNQ5O.mjs}

@@ -3,17 +3,17 @@ import { createRequire as __createRequire } from 'node:module'; const require =
 // plugins/metadata.json
 var metadata_default = {
   name: "apexrest-apex",
-  version: "1.2.0",
-  description: "Develop, deploy and test Oracle APEX applications with Codex.",
+  version: "1.3.0",
+  description: "Develop, deploy and test Oracle APEX applications from Codex or Claude Code.",
   author: {
     name: "APEXREST",
     url: "https://apex.rest"
   },
   license: "Apache-2.0",
   interface: {
-    displayName: "APEXREST for Codex",
+    displayName: "APEXREST for Codex and Claude Code",
     shortDescription: "Oracle APEX development workflows",
-    longDescription: "Oracle APEX development, controlled deployment and testing directly in your current Codex session.",
+    longDescription: "Oracle APEX development, controlled deployment and testing directly in your current Codex or Claude Code session.",
     developerName: "APEXREST",
     websiteURL: "https://apex.rest",
     composerIcon: "./assets/apexrest-icon.svg",
@@ -22,9 +22,9 @@ var metadata_default = {
     category: "Productivity",
     capabilities: ["Read", "Write"],
     defaultPrompt: [
-      "Use $apexrest-work to complete my APEX change directly in this Codex session.",
-      "Use $apexrest-panel to open project settings and Oracle/APEX operations inside Codex.",
-      "Use $apexrest-menu to show all functions, setup and connection diagnostics."
+      "Use $apexrest-work to build or change my Oracle APEX application in this session.",
+      "Use $apexrest-setup to check my tools and connection references.",
+      "Use $apexrest-safety to explain what blocked my APEX deployment or test."
     ]
   }
 };