pi-apexlang 0.1.0 → 0.2.0

package/extensions/apexlang/index.ts

@@ -157,7 +157,7 @@ export function createApexlangTool(overrides: Partial<ApexlangDependencies> = {}
     ),
     list: Type.Optional(Type.Boolean({ description: "List matching compiler component types." })),
     supporting_objects: Type.Optional(
-      Type.Boolean({ description: "Include supporting objects in runtime preflight/doctor." })
+      Type.Boolean({ description: "Include supporting objects in runtime preflight, validation, and import." })
     ),
     fix_vocab: Type.Optional(
       Type.Boolean({ description: "Apply local vocabulary fixes after interactive confirmation." })
@@ -250,6 +250,12 @@ export function createApexlangTool(overrides: Partial<ApexlangDependencies> = {}
         };
       }
       if (choice === IMPORT_CHOICE) {
+        const expectedAppDigest = String(result.appDigest ?? "").trim().toLowerCase();
+        if (!/^[a-f0-9]{64}$/.test(expectedAppDigest)) {
+          throw new Error(
+            "APEXlang live check did not produce a valid application snapshot digest; import is blocked until it is revalidated."
+          );
+        }
         const targetChoice = await ctx.ui.select("Choose the explicitly intended import target:", [
           UPDATE_EXISTING_CHOICE,
           CREATE_NEW_CHOICE
@@ -286,7 +292,9 @@ export function createApexlangTool(overrides: Partial<ApexlangDependencies> = {}
             ],
             details: { action: input.action, targetResolutionMode, provingTarget: true }
           });
-          const proofResult = await dependencies.runCreateNewProof(input, runOptions);
+          const proofResult = await dependencies.runCreateNewProof(input, runOptions, {
+            expectedAppDigest
+          });
           if (!createNewTargetProved(proofResult)) {
             throw new Error(
               failureOutput(
@@ -329,7 +337,8 @@ export function createApexlangTool(overrides: Partial<ApexlangDependencies> = {}
         });
         const importResult = await dependencies.runImport(input, runOptions, {
           targetResolutionMode,
-          createNewConfirmed
+          createNewConfirmed,
+          expectedAppDigest
         });
         const importOutput = processOutput(importResult);
         if (!liveImportPassed(importResult)) {

package/extensions/lib/apexlang-cli.d.mts

@@ -43,11 +43,21 @@ export interface ApexlangRunOptions {
 export interface ApexlangImportOptions {
   targetResolutionMode?: "update-existing" | "create-new";
   createNewConfirmed?: boolean;
+  expectedAppDigest?: string;
+}
+
+export interface ApexlangApprovedImportOptions extends ApexlangImportOptions {
+  expectedAppDigest: string;
+}
+
+export interface ApexlangCreateNewProofOptions {
+  expectedAppDigest: string;
 }
 
 export interface ProcessTreeOptions {
   cwd: string;
   env?: NodeJS.ProcessEnv;
+  input?: string;
   maxBuffer?: number;
   signal?: AbortSignal;
   timeoutMs?: number;
@@ -60,11 +70,43 @@ export interface ApexlangProcessResult {
   stderr: string;
 }
 
+export interface SqlclValidationImportOptions extends ProcessTreeOptions {
+  validateCommand: string;
+  importCommand: string;
+}
+
+export interface SqlclValidationImportResult extends ApexlangProcessResult {
+  validationAccepted: boolean;
+  validationEvidence: {
+    accepted: boolean;
+    reason: string;
+    warningCount?: number;
+    validationSuccessCount?: number;
+    outputSha256?: string;
+  };
+  ptyBacked: true;
+  ptyProcessGroupReady: boolean;
+  sessionReady: boolean;
+  validationSent: boolean;
+  importSent: boolean;
+  importCompleted: boolean;
+  hardFailureDetected: boolean;
+  orderedMergedOutput: true;
+  validationOutput: string;
+  importOutput: string;
+}
+
 export interface ApexlangRunResult extends ApexlangProcessResult {
   action: ApexlangAction;
   command: ApexlangCommand;
   outputRoot: string;
   preludeResults: ApexlangProcessResult[];
+  runtimeApp: {
+    appPath?: string;
+    staged: boolean;
+    workspaceSource?: "workspace.name" | "app.workspace.name" | "explicit_workspace_name";
+  };
+  appDigest?: string;
 }
 
 export const APEXLANG_SKILL_ROOT: string;
@@ -91,11 +133,79 @@ export function validateMaterializationPaths(options: {
   requested: string;
   suggested: string;
 }): Promise<string>;
+export function prepareRuntimeApp(
+  input: ApexlangInput,
+  cwd: string,
+  outputRoot: string,
+  options?: { forceStage?: boolean }
+): Promise<{
+  appPath?: string;
+  staged: boolean;
+  workspaceSource?: "workspace.name" | "app.workspace.name" | "explicit_workspace_name";
+}>;
+export function computeApexlangAppDigest(appPath: string): Promise<string>;
+export function classifyWarningOnlyRuntimePayload(
+  payload: Record<string, unknown>,
+  transcript: string,
+  expectedImportIntent?: "validate-only" | "validate-and-import"
+): {
+  accepted: boolean;
+  reason: string;
+  attemptLabel?: string;
+  warningCount?: number;
+  validationSuccessCount?: number;
+  attemptSha256?: string;
+};
+export function classifyWarningCompatibleSqlclValidation(output: string): {
+  accepted: boolean;
+  reason: string;
+  warningCount: number;
+  validationSuccessCount: number;
+  outputSha256?: string;
+};
+export function proveWarningOnlyProblemsAreDiagnostics(
+  payload: Record<string, any>,
+  result: Pick<ApexlangRunResult, "outputRoot">
+): Promise<{
+  accepted: boolean;
+  reason?: string;
+  problemCount?: number;
+  problemsPath?: string;
+  problemsSha256?: string;
+}>;
+export function validateUpdateExistingImportProof(
+  payload: Record<string, any>,
+  input: ApexlangInput,
+  stagedAppPath: string
+): {
+  canonicalId: number;
+  canonicalAlias: string;
+  sourceId: number;
+  sourceAlias: string;
+  workspaceId: string;
+  workspaceName: string;
+};
+export function buildWarningCompatibleImportCommands(options: {
+  appPath: string;
+  workspaceId: string;
+  canonicalId: number;
+}): { validateCommand: string; importCommand: string };
+export function runWarningCompatibleImport(
+  input: ApexlangInput,
+  result: ApexlangRunResult,
+  options: ApexlangRunOptions,
+  dependencies?: { sessionRunner?: typeof executeSqlclValidationThenImport }
+): Promise<ApexlangRunResult>;
 export function executeProcessTree(
   executable: string,
   args: string[],
   options: ProcessTreeOptions
 ): Promise<ApexlangProcessResult>;
+export function executeSqlclValidationThenImport(
+  executable: string,
+  args: string[],
+  options: SqlclValidationImportOptions
+): Promise<SqlclValidationImportResult>;
 export function runApexlang(
   input: ApexlangInput,
   options: ApexlangRunOptions
@@ -103,9 +213,10 @@ export function runApexlang(
 export function runApexlangImport(
   input: ApexlangInput,
   options: ApexlangRunOptions,
-  importOptions?: ApexlangImportOptions
+  importOptions: ApexlangApprovedImportOptions
 ): Promise<ApexlangRunResult>;
 export function runApexlangCreateNewProof(
   input: ApexlangInput,
-  options: ApexlangRunOptions
+  options: ApexlangRunOptions,
+  proofOptions: ApexlangCreateNewProofOptions
 ): Promise<ApexlangRunResult>;