skedyul 1.7.12 → 1.7.14

package/dist/.build-stamp

@@ -1 +1 @@
-1786072268866
+1786097937910

package/dist/cli/index.js

@@ -1151,6 +1151,12 @@ function parseEnvFieldsFromBlock(envBlock) {
     if (descMatch) field.description = descMatch[1];
     const scopeMatch = varContent.match(/scope\s*:\s*['"`](provision|install)['"`]/);
     if (scopeMatch) field.scope = scopeMatch[1];
+    const installPhaseMatch = varContent.match(
+      /installPhase\s*:\s*['"`](pre_install|post_install)['"`]/
+    );
+    if (installPhaseMatch) {
+      field.installPhase = installPhaseMatch[1];
+    }
     envVars[varName] = field;
   }
   return envVars;
@@ -1258,11 +1264,25 @@ function buildInstallEnvForSync(legacyInstall, provisionConfig) {
       }
     }
   }
-  return Object.keys(installEnv).length > 0 ? installEnv : void 0;
+  if (Object.keys(installEnv).length === 0) {
+    return void 0;
+  }
+  const pre = {};
+  const post = {};
+  for (const [key, def] of Object.entries(installEnv)) {
+    if (def.installPhase === "post_install") {
+      post[key] = def;
+    } else {
+      pre[key] = def;
+    }
+  }
+  return { pre, post };
 }
 function filterEnvForInstallWorkflow(env, installConfig) {
   const installKeys = new Set(
-    Object.entries(installConfig?.env ?? {}).filter(([, def]) => def.scope === "install").map(([key]) => key)
+    Object.entries(installConfig?.env ?? {}).filter(
+      ([, def]) => def.scope === "install" && def.installPhase !== "post_install"
+    ).map(([key]) => key)
   );
   if (installKeys.size === 0) {
     return {};
@@ -1321,7 +1341,7 @@ async function buildExecutableSyncConfig(registry, inputSchemaToJson, projectDir
       env: buildProvisionEnvFromInstallConfig(legacyInstallConfig.env)
     };
   }
-  const installEnv = buildInstallEnvForSync(legacyInstallConfig, provisionConfig ?? null);
+  const installEnvSplit = buildInstallEnvForSync(legacyInstallConfig, provisionConfig ?? null);
   return {
     name: appConfig?.name,
     handle: appConfig?.handle,
@@ -1329,7 +1349,8 @@ async function buildExecutableSyncConfig(registry, inputSchemaToJson, projectDir
     tools,
     ...webhooks.length > 0 ? { webhooks } : {},
     ...provision ? { provision } : {},
-    ...installEnv ? { install: { env: installEnv } } : {},
+    ...installEnvSplit && Object.keys(installEnvSplit.pre).length > 0 ? { install: { env: installEnvSplit.pre } } : {},
+    ...installEnvSplit && Object.keys(installEnvSplit.post).length > 0 ? { installPost: { env: installEnvSplit.post } } : {},
     syncedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
 }

package/dist/cli/utils/config.d.ts

@@ -23,6 +23,7 @@ export interface InstallEnvField {
     placeholder?: string;
     description?: string;
     scope?: 'provision' | 'install';
+    installPhase?: 'pre_install' | 'post_install';
 }
 export interface InstallConfigData {
     env?: Record<string, InstallEnvField>;
@@ -45,7 +46,7 @@ export declare function loadInstallHandler(projectDir?: string): Promise<((ctx:
 export declare function filterInstallScopedEnv(env: Record<string, InstallEnvField & {
     scope?: string;
 }>): Record<string, InstallEnvField>;
-/** Env vars passed to the install workflow (install-scoped only). */
+/** Env vars passed to the install workflow (pre_install install-scoped only). */
 export declare function filterEnvForInstallWorkflow(env: Record<string, string>, installConfig: InstallConfigData | null): Record<string, string>;
 /**
  * Load provision config (env, models, pages) directly from src/provision/index.ts.

package/dist/config/env-phase.d.ts

@@ -0,0 +1,13 @@
+import type { EnvSchema, EnvVariable, InstallPhase } from './types/env';
+export type { InstallPhase };
+/** Default install collection phase when omitted on install-scoped vars. */
+export declare const DEFAULT_INSTALL_PHASE: InstallPhase;
+export declare function resolveInstallPhase(def: Pick<EnvVariable, 'scope' | 'installPhase' | 'required'>): InstallPhase | null;
+export declare function isPreInstallEnvVar(def: Pick<EnvVariable, 'scope' | 'installPhase' | 'required'>): boolean;
+export declare function isPostInstallEnvVar(def: Pick<EnvVariable, 'scope' | 'installPhase' | 'required'>): boolean;
+export declare function filterEnvSchemaByInstallPhase(env: EnvSchema | undefined, phase: InstallPhase): EnvSchema;
+export declare function splitProvisionEnvSchema(env: EnvSchema | undefined): {
+    global: EnvSchema;
+    preInstall: EnvSchema;
+    postInstall: EnvSchema;
+};

package/dist/config/index.d.ts

@@ -15,3 +15,4 @@ export { defineModel, defineEntity, defineChannel, definePage, defineWorkflow, d
 export { SCHEMA_FILE_EXTENSIONS, loadSchema, saveSchema, serializeSchemaToJson, serializeSchemaToTypeScript, transformToBackendSchema, transformFromBackendSchema, type LoadSchemaOptions, type LoadSchemaResult, type SerializeSchemaOptions, type BackendModelDefinition, type BackendFieldDefinition, type BackendRelationshipDefinition, type BackendDesiredSchema, } from './schema-loader';
 export { loadAndResolveConfig, serializeResolvedConfig, type ResolvedConfig } from './resolver';
 export { getAllEnvKeys, getRequiredInstallEnvKeys } from './utils';
+export { DEFAULT_INSTALL_PHASE, resolveInstallPhase, isPreInstallEnvVar, isPostInstallEnvVar, filterEnvSchemaByInstallPhase, splitProvisionEnvSchema, type InstallPhase, } from './env-phase';

package/dist/config/types/env.d.ts

@@ -12,6 +12,12 @@ import type { Visibility } from './base';
  * - 'install': User-configured during app installation
  */
 export type EnvScope = 'provision' | 'install';
+/**
+ * When an install-scoped variable is collected from the user vs set by the app/platform.
+ * - 'pre_install': user fills on the install page before Install is clicked
+ * - 'post_install': set by OAuth callback, install handler, or runtime (never on pre-install form)
+ */
+export type InstallPhase = 'pre_install' | 'post_install';
 /**
  * Environment variable definition.
  */
@@ -20,6 +26,8 @@ export interface EnvVariable {
     label: string;
     /** Scope: 'provision' (developer) or 'install' (user) */
     scope?: EnvScope;
+    /** When to collect install-scoped vars (default: 'pre_install') */
+    installPhase?: InstallPhase;
     /** Whether this variable is required */
     required?: boolean;
     /** Visibility setting: 'visible' or 'encrypted' */

package/dist/esm/index.mjs

@@ -1168,8 +1168,11 @@ var AgentYAMLV3Schema = z7.object({
 
 // src/schemas.ts
 var EnvVisibilitySchema = z8.enum(["visible", "encrypted"]);
+var InstallPhaseSchema = z8.enum(["pre_install", "post_install"]);
 var EnvVariableDefinitionSchema = z8.object({
   label: z8.string(),
+  scope: z8.enum(["provision", "install"]).optional(),
+  installPhase: InstallPhaseSchema.optional(),
   required: z8.boolean().optional(),
   visibility: EnvVisibilitySchema.optional(),
   default: z8.string().optional(),
@@ -6297,6 +6300,24 @@ import * as os from "os";
 import * as fs5 from "fs";
 import * as path5 from "path";
 
+// src/config/env-phase.ts
+var DEFAULT_INSTALL_PHASE = "pre_install";
+function resolveInstallPhase(def) {
+  if (def.scope === "provision") {
+    return null;
+  }
+  if (def.installPhase === "post_install" || def.installPhase === "pre_install") {
+    return def.installPhase;
+  }
+  if (def.scope === "install") {
+    return def.required ? "pre_install" : "post_install";
+  }
+  return DEFAULT_INSTALL_PHASE;
+}
+function isPreInstallEnvVar(def) {
+  return resolveInstallPhase(def) === "pre_install";
+}
+
 // src/config/utils.ts
 function getAllEnvKeys(config) {
   const provision = config.provision && "env" in config.provision ? config.provision : void 0;
@@ -6309,7 +6330,7 @@ function getAllEnvKeys(config) {
 function getRequiredInstallEnvKeys(config) {
   const provision = config.provision && "env" in config.provision ? config.provision : void 0;
   if (!provision?.env) return [];
-  return Object.entries(provision.env).filter(([, def]) => def.required).map(([key]) => key);
+  return Object.entries(provision.env).filter(([, def]) => def.scope === "install" && isPreInstallEnvVar(def) && def.required).map(([key]) => key);
 }
 
 // src/ratelimit/resolve-queue-key.ts
@@ -8814,6 +8835,7 @@ export {
   InputMappingSchema,
   InstallConfigSchema,
   InstallError,
+  InstallPhaseSchema,
   InvalidConfigurationError,
   LegacyFormBlockDefinitionSchema,
   ListBlockDefinitionSchema,

package/dist/index.js

@@ -125,6 +125,7 @@ __export(index_exports, {
   InputMappingSchema: () => InputMappingSchema,
   InstallConfigSchema: () => InstallConfigSchema,
   InstallError: () => InstallError,
+  InstallPhaseSchema: () => InstallPhaseSchema,
   InvalidConfigurationError: () => InvalidConfigurationError,
   LegacyFormBlockDefinitionSchema: () => LegacyFormBlockDefinitionSchema,
   ListBlockDefinitionSchema: () => ListBlockDefinitionSchema,
@@ -1549,8 +1550,11 @@ var AgentYAMLV3Schema = import_v47.z.object({
 
 // src/schemas.ts
 var EnvVisibilitySchema = import_v48.z.enum(["visible", "encrypted"]);
+var InstallPhaseSchema = import_v48.z.enum(["pre_install", "post_install"]);
 var EnvVariableDefinitionSchema = import_v48.z.object({
   label: import_v48.z.string(),
+  scope: import_v48.z.enum(["provision", "install"]).optional(),
+  installPhase: InstallPhaseSchema.optional(),
   required: import_v48.z.boolean().optional(),
   visibility: EnvVisibilitySchema.optional(),
   default: import_v48.z.string().optional(),
@@ -6678,6 +6682,24 @@ var os = __toESM(require("os"));
 var fs5 = __toESM(require("fs"));
 var path5 = __toESM(require("path"));
 
+// src/config/env-phase.ts
+var DEFAULT_INSTALL_PHASE = "pre_install";
+function resolveInstallPhase(def) {
+  if (def.scope === "provision") {
+    return null;
+  }
+  if (def.installPhase === "post_install" || def.installPhase === "pre_install") {
+    return def.installPhase;
+  }
+  if (def.scope === "install") {
+    return def.required ? "pre_install" : "post_install";
+  }
+  return DEFAULT_INSTALL_PHASE;
+}
+function isPreInstallEnvVar(def) {
+  return resolveInstallPhase(def) === "pre_install";
+}
+
 // src/config/utils.ts
 function getAllEnvKeys(config) {
   const provision = config.provision && "env" in config.provision ? config.provision : void 0;
@@ -6690,7 +6712,7 @@ function getAllEnvKeys(config) {
 function getRequiredInstallEnvKeys(config) {
   const provision = config.provision && "env" in config.provision ? config.provision : void 0;
   if (!provision?.env) return [];
-  return Object.entries(provision.env).filter(([, def]) => def.required).map(([key]) => key);
+  return Object.entries(provision.env).filter(([, def]) => def.scope === "install" && isPreInstallEnvVar(def) && def.required).map(([key]) => key);
 }
 
 // src/ratelimit/resolve-queue-key.ts
@@ -9196,6 +9218,7 @@ var index_default = { z: import_v414.z };
   InputMappingSchema,
   InstallConfigSchema,
   InstallError,
+  InstallPhaseSchema,
   InvalidConfigurationError,
   LegacyFormBlockDefinitionSchema,
   ListBlockDefinitionSchema,

package/dist/schemas.d.ts

@@ -3,8 +3,20 @@ export declare const EnvVisibilitySchema: z.ZodEnum<{
     visible: "visible";
     encrypted: "encrypted";
 }>;
+export declare const InstallPhaseSchema: z.ZodEnum<{
+    pre_install: "pre_install";
+    post_install: "post_install";
+}>;
 export declare const EnvVariableDefinitionSchema: z.ZodObject<{
     label: z.ZodString;
+    scope: z.ZodOptional<z.ZodEnum<{
+        provision: "provision";
+        install: "install";
+    }>>;
+    installPhase: z.ZodOptional<z.ZodEnum<{
+        pre_install: "pre_install";
+        post_install: "post_install";
+    }>>;
     required: z.ZodOptional<z.ZodBoolean>;
     visibility: z.ZodOptional<z.ZodEnum<{
         visible: "visible";
@@ -16,6 +28,14 @@ export declare const EnvVariableDefinitionSchema: z.ZodObject<{
 }, z.core.$strip>;
 export declare const EnvSchemaSchema: z.ZodRecord<z.ZodString, z.ZodObject<{
     label: z.ZodString;
+    scope: z.ZodOptional<z.ZodEnum<{
+        provision: "provision";
+        install: "install";
+    }>>;
+    installPhase: z.ZodOptional<z.ZodEnum<{
+        pre_install: "pre_install";
+        post_install: "post_install";
+    }>>;
     required: z.ZodOptional<z.ZodBoolean>;
     visibility: z.ZodOptional<z.ZodEnum<{
         visible: "visible";
@@ -329,6 +349,14 @@ export declare const ModelDefinitionSchema: z.ZodObject<{
     page: z.ZodOptional<z.ZodString>;
     env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         label: z.ZodString;
+        scope: z.ZodOptional<z.ZodEnum<{
+            provision: "provision";
+            install: "install";
+        }>>;
+        installPhase: z.ZodOptional<z.ZodEnum<{
+            pre_install: "pre_install";
+            post_install: "post_install";
+        }>>;
         required: z.ZodOptional<z.ZodBoolean>;
         visibility: z.ZodOptional<z.ZodEnum<{
             visible: "visible";
@@ -3202,6 +3230,14 @@ export type AgentDefinition = z.infer<typeof AgentDefinitionSchema>;
 export declare const InstallConfigSchema: z.ZodObject<{
     env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         label: z.ZodString;
+        scope: z.ZodOptional<z.ZodEnum<{
+            provision: "provision";
+            install: "install";
+        }>>;
+        installPhase: z.ZodOptional<z.ZodEnum<{
+            pre_install: "pre_install";
+            post_install: "post_install";
+        }>>;
         required: z.ZodOptional<z.ZodBoolean>;
         visibility: z.ZodOptional<z.ZodEnum<{
             visible: "visible";
@@ -3301,6 +3337,14 @@ export declare const InstallConfigSchema: z.ZodObject<{
         page: z.ZodOptional<z.ZodString>;
         env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
             label: z.ZodString;
+            scope: z.ZodOptional<z.ZodEnum<{
+                provision: "provision";
+                install: "install";
+            }>>;
+            installPhase: z.ZodOptional<z.ZodEnum<{
+                pre_install: "pre_install";
+                post_install: "post_install";
+            }>>;
             required: z.ZodOptional<z.ZodBoolean>;
             visibility: z.ZodOptional<z.ZodEnum<{
                 visible: "visible";
@@ -3410,6 +3454,14 @@ export declare const BatchOperationDefinitionSchema: z.ZodObject<{
 export declare const ProvisionConfigSchema: z.ZodObject<{
     env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         label: z.ZodString;
+        scope: z.ZodOptional<z.ZodEnum<{
+            provision: "provision";
+            install: "install";
+        }>>;
+        installPhase: z.ZodOptional<z.ZodEnum<{
+            pre_install: "pre_install";
+            post_install: "post_install";
+        }>>;
         required: z.ZodOptional<z.ZodBoolean>;
         visibility: z.ZodOptional<z.ZodEnum<{
             visible: "visible";
@@ -3509,6 +3561,14 @@ export declare const ProvisionConfigSchema: z.ZodObject<{
         page: z.ZodOptional<z.ZodString>;
         env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
             label: z.ZodString;
+            scope: z.ZodOptional<z.ZodEnum<{
+                provision: "provision";
+                install: "install";
+            }>>;
+            installPhase: z.ZodOptional<z.ZodEnum<{
+                pre_install: "pre_install";
+                post_install: "post_install";
+            }>>;
             required: z.ZodOptional<z.ZodBoolean>;
             visibility: z.ZodOptional<z.ZodEnum<{
                 visible: "visible";
@@ -4243,6 +4303,14 @@ export declare const SkedyulConfigSchema: z.ZodObject<{
     provision: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
         env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
             label: z.ZodString;
+            scope: z.ZodOptional<z.ZodEnum<{
+                provision: "provision";
+                install: "install";
+            }>>;
+            installPhase: z.ZodOptional<z.ZodEnum<{
+                pre_install: "pre_install";
+                post_install: "post_install";
+            }>>;
             required: z.ZodOptional<z.ZodBoolean>;
             visibility: z.ZodOptional<z.ZodEnum<{
                 visible: "visible";
@@ -4342,6 +4410,14 @@ export declare const SkedyulConfigSchema: z.ZodObject<{
             page: z.ZodOptional<z.ZodString>;
             env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
                 label: z.ZodString;
+                scope: z.ZodOptional<z.ZodEnum<{
+                    provision: "provision";
+                    install: "install";
+                }>>;
+                installPhase: z.ZodOptional<z.ZodEnum<{
+                    pre_install: "pre_install";
+                    post_install: "post_install";
+                }>>;
                 required: z.ZodOptional<z.ZodBoolean>;
                 visibility: z.ZodOptional<z.ZodEnum<{
                     visible: "visible";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skedyul",
-  "version": "1.7.12",
+  "version": "1.7.14",
   "description": "The Skedyul SDK for Node.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",