@tachyon-gg/railway-deploy 0.2.3 → 0.2.5

package/README.md

@@ -209,11 +209,26 @@ variables:
 | `${ENV_VAR}` | At config load time | Reads from local environment (or `--env-file`) |
 | `${{service.VAR}}` | At Railway runtime | Railway reference variable (cross-service) |
 | `%{param}` | At config load time | Template parameter substitution |
+| `%{service_name}` | At config load time | Built-in: the service's config key |
 | `null` | N/A | Marks a variable for deletion |
 
+`%{param}` is expanded first, so it can be used inside `${{}}` Railway references. This is useful for templates that need to reference their own or other services' variables:
+
+```yaml
+variables:
+  # Reference own service's variable (resolves %{service_name} at config time,
+  # Railway resolves the ${{}} reference at runtime)
+  DATABASE_URL: ${{%{service_name}.DATABASE_URL}}
+
+  # Reference another service by param
+  REDIS_URL: ${{%{cache_service}.REDIS_URL}}
+```
+
 ### Service templates
 
-Templates extract reusable service definitions with parameterized values:
+Templates extract reusable service definitions with parameterized values.
+
+The built-in `%{service_name}` param is always available and resolves to the service's key in the config (e.g., `web`, `api`). It cannot be overridden.
 
 ```yaml
 # services/web.yaml
@@ -228,10 +243,11 @@ source:
 
 variables:
   APP_VERSION: "%{tag}"
+  SERVICE_NAME: "%{service_name}"
   DATABASE_URL: ${{Postgres.DATABASE_URL}}
 
 domains:
-  - "%{tag}.example.com"
+  - "%{service_name}.example.com"
 
 healthcheck:
   path: /health

package/dist/index.js

@@ -23805,6 +23805,7 @@ var {
 
 // src/index.ts
 import { existsSync as existsSync2, readFileSync as readFileSync3 } from "fs";
+import { createRequire as createRequire2 } from "module";
 import { resolve as resolve2 } from "path";
 import { createInterface } from "readline";
 
@@ -37708,9 +37709,12 @@ function resolveService(name, entry, envDir, lenient = false) {
     validateServiceTemplate(parsed, templatePath);
     template = parsed;
   }
-  let params = {};
+  if ("service_name" in (entry.params ?? {}) || "service_name" in (template?.params ?? {})) {
+    throw new Error(`"service_name" is a built-in parameter and cannot be overridden (service "${name}")`);
+  }
+  let params = { service_name: name };
   if (template?.params) {
-    params = resolveParams(template.params, entry.params || {});
+    params = { ...resolveParams(template.params, entry.params || {}), service_name: name };
   }
   let source = template?.source ? expandParamsDeep(template.source, params) : entry.source;
   const volume = template?.volume ? expandParamsDeep(template.volume, params) : entry.volume;
@@ -37739,9 +37743,8 @@ function resolveService(name, entry, envDir, lenient = false) {
   const railwayConfigFile = template?.railway_config_file ? expandParamsDeep(template.railway_config_file, params) : entry.railway_config_file;
   const staticOutboundIps = template?.static_outbound_ips ?? entry.static_outbound_ips;
   let templateDomains = [];
-  if (template) {
-    const tplDomains = template.domains ? expandParamsDeep(template.domains, params) : undefined;
-    templateDomains = normalizeDomains(tplDomains);
+  if (template?.domains) {
+    templateDomains = normalizeDomains(expandParamsDeep(template.domains, params));
   }
   const entryDomains = normalizeDomains(entry.domains);
   if (entry.source)
@@ -38446,8 +38449,8 @@ var EgressGatewayAssociationCreateDocument = { kind: "Document", definitions: [{
 var EgressGatewayAssociationsClearDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "mutation", name: { kind: "Name", value: "EgressGatewayAssociationsClear" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "input" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "EgressGatewayServiceTargetInput" } } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "egressGatewayAssociationsClear" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "input" }, value: { kind: "Variable", name: { kind: "Name", value: "input" } } }] }] } }] };
 var ListProjectsDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "ListProjects" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "projects" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "edges" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "node" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "name" } }] } }] } }] } }] } }] };
 var GetProjectDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetProject" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "id" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "project" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "id" }, value: { kind: "Variable", name: { kind: "Name", value: "id" } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "name" } }, { kind: "Field", name: { kind: "Name", value: "environments" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "edges" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "node" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "name" } }, { kind: "Field", name: { kind: "Name", value: "deploymentTriggers" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "edges" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "node" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "branch" } }, { kind: "Field", name: { kind: "Name", value: "checkSuites" } }, { kind: "Field", name: { kind: "Name", value: "serviceId" } }, { kind: "Field", name: { kind: "Name", value: "repository" } }] } }] } }] } }] } }] } }] } }, { kind: "Field", name: { kind: "Name", value: "services" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "edges" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "node" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "name" } }, { kind: "Field", name: { kind: "Name", value: "serviceInstances" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "edges" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "node" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "environmentId" } }, { kind: "Field", name: { kind: "Name", value: "source" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "image" } }, { kind: "Field", name: { kind: "Name", value: "repo" } }] } }, { kind: "Field", name: { kind: "Name", value: "domains" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "customDomains" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "domain" } }, { kind: "Field", name: { kind: "Name", value: "targetPort" } }] } }, { kind: "Field", name: { kind: "Name", value: "serviceDomains" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "domain" } }, { kind: "Field", name: { kind: "Name", value: "targetPort" } }] } }] } }, { kind: "Field", name: { kind: "Name", value: "region" } }, { kind: "Field", name: { kind: "Name", value: "numReplicas" } }, { kind: "Field", name: { kind: "Name", value: "restartPolicyType" } }, { kind: "Field", name: { kind: "Name", value: "restartPolicyMaxRetries" } }, { kind: "Field", name: { kind: "Name", value: "healthcheckPath" } }, { kind: "Field", name: { kind: "Name", value: "healthcheckTimeout" } }, { kind: "Field", name: { kind: "Name", value: "cronSchedule" } }, { kind: "Field", name: { kind: "Name", value: "startCommand" } }, { kind: "Field", name: { kind: "Name", value: "buildCommand" } }, { kind: "Field", name: { kind: "Name", value: "rootDirectory" } }, { kind: "Field", name: { kind: "Name", value: "dockerfilePath" } }, { kind: "Field", name: { kind: "Name", value: "preDeployCommand" } }, { kind: "Field", name: { kind: "Name", value: "sleepApplication" } }, { kind: "Field", name: { kind: "Name", value: "builder" } }, { kind: "Field", name: { kind: "Name", value: "watchPatterns" } }, { kind: "Field", name: { kind: "Name", value: "drainingSeconds" } }, { kind: "Field", name: { kind: "Name", value: "overlapSeconds" } }, { kind: "Field", name: { kind: "Name", value: "ipv6EgressEnabled" } }, { kind: "Field", name: { kind: "Name", value: "railwayConfigFile" } }] } }] } }] } }] } }] } }] } }, { kind: "Field", name: { kind: "Name", value: "buckets" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "edges" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "node" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "name" } }] } }] } }] } }, { kind: "Field", name: { kind: "Name", value: "volumes" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "edges" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "node" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "name" } }, { kind: "Field", name: { kind: "Name", value: "volumeInstances" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "edges" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "node" }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "mountPath" } }, { kind: "Field", name: { kind: "Name", value: "environmentId" } }, { kind: "Field", name: { kind: "Name", value: "serviceId" } }] } }] } }] } }] } }] } }] } }] } }] } }] };
-var GetVariablesDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetVariables" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "projectId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "environmentId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "serviceId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "variables" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "projectId" }, value: { kind: "Variable", name: { kind: "Name", value: "projectId" } } }, { kind: "Argument", name: { kind: "Name", value: "environmentId" }, value: { kind: "Variable", name: { kind: "Name", value: "environmentId" } } }, { kind: "Argument", name: { kind: "Name", value: "serviceId" }, value: { kind: "Variable", name: { kind: "Name", value: "serviceId" } } }] }] } }] };
-var GetSharedVariablesDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetSharedVariables" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "projectId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "environmentId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "variables" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "projectId" }, value: { kind: "Variable", name: { kind: "Name", value: "projectId" } } }, { kind: "Argument", name: { kind: "Name", value: "environmentId" }, value: { kind: "Variable", name: { kind: "Name", value: "environmentId" } } }] }] } }] };
+var GetVariablesDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetVariables" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "projectId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "environmentId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "serviceId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "variables" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "projectId" }, value: { kind: "Variable", name: { kind: "Name", value: "projectId" } } }, { kind: "Argument", name: { kind: "Name", value: "environmentId" }, value: { kind: "Variable", name: { kind: "Name", value: "environmentId" } } }, { kind: "Argument", name: { kind: "Name", value: "serviceId" }, value: { kind: "Variable", name: { kind: "Name", value: "serviceId" } } }, { kind: "Argument", name: { kind: "Name", value: "unrendered" }, value: { kind: "BooleanValue", value: true } }] }] } }] };
+var GetSharedVariablesDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetSharedVariables" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "projectId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "environmentId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "variables" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "projectId" }, value: { kind: "Variable", name: { kind: "Name", value: "projectId" } } }, { kind: "Argument", name: { kind: "Name", value: "environmentId" }, value: { kind: "Variable", name: { kind: "Name", value: "environmentId" } } }, { kind: "Argument", name: { kind: "Name", value: "unrendered" }, value: { kind: "BooleanValue", value: true } }] }] } }] };
 var GetTcpProxiesDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetTcpProxies" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "serviceId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "environmentId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "tcpProxies" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "serviceId" }, value: { kind: "Variable", name: { kind: "Name", value: "serviceId" } } }, { kind: "Argument", name: { kind: "Name", value: "environmentId" }, value: { kind: "Variable", name: { kind: "Name", value: "environmentId" } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }, { kind: "Field", name: { kind: "Name", value: "applicationPort" } }, { kind: "Field", name: { kind: "Name", value: "proxyPort" } }, { kind: "Field", name: { kind: "Name", value: "domain" } }] } }] } }] };
 var GetServiceInstanceLimitsDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetServiceInstanceLimits" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "serviceId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "environmentId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "serviceInstanceLimits" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "serviceId" }, value: { kind: "Variable", name: { kind: "Name", value: "serviceId" } } }, { kind: "Argument", name: { kind: "Name", value: "environmentId" }, value: { kind: "Variable", name: { kind: "Name", value: "environmentId" } } }] }] } }] };
 var GetEgressGatewaysDocument = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetEgressGateways" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "serviceId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "environmentId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "egressGateways" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "serviceId" }, value: { kind: "Variable", name: { kind: "Name", value: "serviceId" } } }, { kind: "Argument", name: { kind: "Name", value: "environmentId" }, value: { kind: "Variable", name: { kind: "Name", value: "environmentId" } } }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "ipv4" } }, { kind: "Field", name: { kind: "Name", value: "region" } }] } }] } }] };
@@ -38890,7 +38893,19 @@ function yellow(text, noColor) {
 function dim(text, noColor) {
   return noColor ? text : `\x1B[2m${text}\x1B[0m`;
 }
-var SENSITIVE_PATTERNS = ["PASSWORD", "SECRET", "TOKEN", "KEY", "PRIVATE", "CREDENTIAL"];
+var SENSITIVE_PATTERNS = [
+  "PASSWORD",
+  "PASSPHRASE",
+  "SECRET",
+  "TOKEN",
+  "KEY",
+  "PRIVATE",
+  "CREDENTIAL",
+  "JWT",
+  "CERT",
+  "SIGNING",
+  "ENCRYPTION"
+];
 function isSensitive(key) {
   const upper = key.toUpperCase();
   return SENSITIVE_PATTERNS.some((p) => upper.includes(p));
@@ -38910,22 +38925,25 @@ function describeChange(change) {
       if (change.cronSchedule)
         details.push(`cron: ${change.cronSchedule}`);
       return {
-        category: "Services",
+        category: "Service",
         action: "create",
-        summary: `${change.name} (${details.join(", ")})`
+        serviceName: change.name,
+        summary: `create (${details.join(", ")})`
       };
     }
     case "delete-service":
       return {
-        category: "Services",
+        category: "Service",
         action: "delete",
-        summary: `${change.name} (${change.serviceId})`
+        serviceName: change.name,
+        summary: `delete (${change.serviceId})`
       };
     case "update-service-settings":
       return {
-        category: "Service settings",
+        category: "Settings",
         action: "update",
-        summary: `${change.serviceName}: ${Object.keys(change.settings).join(", ")}`
+        serviceName: change.serviceName,
+        summary: `settings: ${Object.keys(change.settings).join(", ")}`
       };
     case "update-deployment-trigger": {
       const parts = [];
@@ -38934,82 +38952,99 @@ function describeChange(change) {
       if (change.checkSuites !== undefined)
         parts.push(`checkSuites → ${change.checkSuites}`);
       return {
-        category: "Deployment triggers",
+        category: "Trigger",
         action: "update",
-        summary: `${change.serviceName}: ${parts.join(", ")}`
+        serviceName: change.serviceName,
+        summary: `trigger: ${parts.join(", ")}`
       };
     }
     case "upsert-variables":
       return {
-        category: "Service variables",
+        category: "Variables",
         action: "update",
-        summary: `${change.serviceName}: set ${Object.keys(change.variables).length} var(s) — ${Object.keys(change.variables).join(", ")}`
+        serviceName: change.serviceName,
+        summary: `set ${Object.keys(change.variables).length} var(s) — ${Object.keys(change.variables).join(", ")}`
       };
     case "delete-variables":
       return {
-        category: "Service variables",
+        category: "Variables",
         action: "delete",
-        summary: `${change.serviceName}: delete ${change.variableNames.length} var(s) — ${change.variableNames.join(", ")}`
+        serviceName: change.serviceName,
+        summary: `delete ${change.variableNames.length} var(s) — ${change.variableNames.join(", ")}`
       };
     case "upsert-shared-variables":
       return {
         category: "Shared variables",
         action: "update",
+        serviceName: null,
         summary: `set ${Object.keys(change.variables).length} var(s) — ${Object.keys(change.variables).join(", ")}`
       };
     case "delete-shared-variables":
       return {
         category: "Shared variables",
         action: "delete",
+        serviceName: null,
         summary: `delete ${change.variableNames.length} var(s) — ${change.variableNames.join(", ")}`
       };
     case "create-domain": {
       const port = change.targetPort ? ` (port ${change.targetPort})` : "";
       return {
-        category: "Domains",
+        category: "Domain",
         action: "create",
-        summary: `${change.serviceName}: ${change.domain}${port}`
+        serviceName: change.serviceName,
+        summary: `domain: ${change.domain}${port}`
       };
     }
     case "delete-domain":
       return {
-        category: "Domains",
+        category: "Domain",
         action: "delete",
-        summary: `${change.serviceName}: ${change.domain}`
+        serviceName: change.serviceName,
+        summary: `domain: ${change.domain}`
       };
     case "create-service-domain": {
       const port = change.targetPort ? ` (port ${change.targetPort})` : "";
       return {
-        category: "Railway domains",
+        category: "Railway domain",
         action: "create",
-        summary: `${change.serviceName}${port}`
+        serviceName: change.serviceName,
+        summary: `railway domain${port}`
       };
     }
     case "delete-service-domain":
-      return { category: "Railway domains", action: "delete", summary: change.serviceName };
+      return {
+        category: "Railway domain",
+        action: "delete",
+        serviceName: change.serviceName,
+        summary: "railway domain"
+      };
     case "create-volume":
       return {
-        category: "Volumes",
+        category: "Volume",
         action: "create",
-        summary: `${change.serviceName}: ${change.mount}`
+        serviceName: change.serviceName,
+        summary: `volume: ${change.mount}`
       };
     case "delete-volume":
       return {
-        category: "Volumes",
+        category: "Volume",
         action: "delete",
-        summary: `${change.serviceName} (${change.volumeId})`
+        serviceName: change.serviceName,
+        summary: `volume (${change.volumeId})`
       };
     case "create-tcp-proxy":
       return {
-        category: "TCP proxies",
+        category: "TCP proxy",
         action: "create",
-        summary: `${change.serviceName}: port ${change.applicationPort}`
+        serviceName: change.serviceName,
+        summary: `tcp proxy: port ${change.applicationPort}`
       };
     case "delete-tcp-proxy":
       return {
-        category: "TCP proxies",
+        category: "TCP proxy",
         action: "delete",
-        summary: `${change.serviceName}: proxy ${change.proxyId}`
+        serviceName: change.serviceName,
+        summary: `tcp proxy: ${change.proxyId}`
       };
     case "update-service-limits": {
       const parts = [];
@@ -39018,36 +39053,50 @@ function describeChange(change) {
       if (change.limits.vCPUs !== undefined)
         parts.push(`vCPUs: ${change.limits.vCPUs ?? "unset"}`);
       return {
-        category: "Resource limits",
+        category: "Limits",
         action: "update",
-        summary: `${change.serviceName}: ${parts.join(", ")}`
+        serviceName: change.serviceName,
+        summary: `limits: ${parts.join(", ")}`
       };
     }
     case "enable-static-ips":
       return {
-        category: "Static outbound IPs",
+        category: "Static IPs",
         action: "create",
-        summary: `${change.serviceName}: enable`
+        serviceName: change.serviceName,
+        summary: "static outbound IPs: enable"
       };
     case "disable-static-ips":
       return {
-        category: "Static outbound IPs",
+        category: "Static IPs",
         action: "delete",
-        summary: `${change.serviceName}: disable`
+        serviceName: change.serviceName,
+        summary: "static outbound IPs: disable"
       };
     case "create-bucket":
-      return { category: "Buckets", action: "create", summary: change.bucketName };
+      return {
+        category: "Buckets",
+        action: "create",
+        serviceName: null,
+        summary: change.bucketName
+      };
     case "delete-bucket":
-      return { category: "Buckets", action: "delete", summary: change.name };
+      return { category: "Buckets", action: "delete", serviceName: null, summary: change.name };
     default: {
       const _exhaustive = change;
-      return { category: "Unknown", action: "update", summary: _exhaustive.type };
+      return {
+        category: "Unknown",
+        action: "update",
+        serviceName: null,
+        summary: _exhaustive.type
+      };
     }
   }
 }
 function changeLabel(change) {
   const desc = describeChange(change);
-  return `${change.type}: ${desc.summary}`;
+  const prefix = desc.serviceName ? `${desc.serviceName}: ` : "";
+  return `${prefix}${desc.summary}`;
 }
 var ACTION_ICON = {
   create: (nc) => green("+", nc),
@@ -39066,44 +39115,60 @@ ${green("No changes needed", noColor)} — Railway matches desired state.
   console.log(`
 Changeset (${changeset.changes.length} changes):
 `);
-  const groups = new Map;
-  for (const change of changeset.changes) {
-    const desc = describeChange(change);
-    let group = groups.get(desc.category);
+  const described = changeset.changes.map((change) => ({ change, desc: describeChange(change) }));
+  const serviceGroups = new Map;
+  for (const entry of described) {
+    const key = entry.desc.serviceName;
+    let group = serviceGroups.get(key);
     if (!group) {
       group = [];
-      groups.set(desc.category, group);
+      serviceGroups.set(key, group);
+    }
+    group.push(entry);
+  }
+  const projectChanges = serviceGroups.get(null);
+  if (projectChanges) {
+    for (const { change, desc } of projectChanges) {
+      const icon = ACTION_ICON[desc.action](noColor);
+      if (verbose && change.type === "upsert-shared-variables") {
+        console.log(`  ${yellow("~", noColor)} Shared variables:`);
+        for (const [key, value] of Object.entries(change.variables)) {
+          const oldVal = options?.currentState?.sharedVariables[key];
+          const oldStr = oldVal !== undefined ? maskValue(key, oldVal) : "(unset)";
+          console.log(`    ${icon} ${key}: ${dim(`"${oldStr}"`, noColor)} → ${dim(`"${maskValue(key, value)}"`, noColor)}`);
+        }
+      } else {
+        console.log(`  ${icon} ${desc.category}: ${desc.summary}`);
+      }
     }
-    group.push({ change, desc });
+    console.log();
+    serviceGroups.delete(null);
   }
-  for (const [category, entries] of groups) {
-    const actions = new Set(entries.map((e) => e.desc.action));
-    const headerAction = actions.size === 1 ? [...actions][0] : "update";
+  for (const [serviceName, entries] of serviceGroups) {
+    const hasCreate = entries.some((e) => e.desc.action === "create" && e.desc.category === "Service");
+    const hasDelete = entries.some((e) => e.desc.action === "delete" && e.desc.category === "Service");
+    const headerAction = hasCreate ? "create" : hasDelete ? "delete" : "update";
     const headerIcon = ACTION_ICON[headerAction](noColor);
-    console.log(`  ${headerIcon} ${category.toUpperCase()}:`);
+    console.log(`  ${headerIcon} ${serviceName}:`);
     for (const { change, desc } of entries) {
       const icon = ACTION_ICON[desc.action](noColor);
       if (verbose && change.type === "update-service-settings") {
-        console.log(`    ${icon} ${change.serviceName}:`);
         for (const [key, value] of Object.entries(change.settings)) {
+          if (isSensitive(key)) {
+            console.log(`    ${icon} ${key}: ***`);
+            continue;
+          }
           const currentSvc = options?.currentState?.services[change.serviceName];
           const oldVal = currentSvc ? currentSvc[key] : undefined;
           const oldStr = oldVal !== undefined ? JSON.stringify(oldVal) : "(unset)";
           const newStr = value === null ? "(unset)" : JSON.stringify(value);
-          console.log(`      ${key}: ${oldStr} → ${newStr}`);
+          console.log(`    ${icon} ${key}: ${oldStr} → ${newStr}`);
         }
       } else if (verbose && change.type === "upsert-variables") {
-        console.log(`    ${change.serviceName}:`);
         for (const [key, value] of Object.entries(change.variables)) {
           const currentSvc = options?.currentState?.services[change.serviceName];
           const oldVal = currentSvc?.variables[key];
           const oldStr = oldVal !== undefined ? maskValue(key, oldVal) : "(unset)";
-          console.log(`      ${icon} ${key}: ${dim(`"${oldStr}"`, noColor)} → ${dim(`"${maskValue(key, value)}"`, noColor)}`);
-        }
-      } else if (verbose && change.type === "upsert-shared-variables") {
-        for (const [key, value] of Object.entries(change.variables)) {
-          const oldVal = options?.currentState?.sharedVariables[key];
-          const oldStr = oldVal !== undefined ? maskValue(key, oldVal) : "(unset)";
           console.log(`    ${icon} ${key}: ${dim(`"${oldStr}"`, noColor)} → ${dim(`"${maskValue(key, value)}"`, noColor)}`);
         }
       } else {
@@ -39115,15 +39180,13 @@ Changeset (${changeset.changes.length} changes):
   let createCount = 0;
   let updateCount = 0;
   let deleteCount = 0;
-  for (const entries of groups.values()) {
-    for (const { desc } of entries) {
-      if (desc.action === "create")
-        createCount++;
-      else if (desc.action === "update")
-        updateCount++;
-      else
-        deleteCount++;
-    }
+  for (const { desc } of described) {
+    if (desc.action === "create")
+      createCount++;
+    else if (desc.action === "update")
+      updateCount++;
+    else
+      deleteCount++;
   }
   const parts = [];
   if (createCount > 0)
@@ -39630,12 +39693,12 @@ function diffServiceSettings(desired, current, changes) {
   if (desired.ipv6EgressEnabled !== current.ipv6EgressEnabled) {
     settings.ipv6EgressEnabled = desired.ipv6EgressEnabled ?? null;
   }
-  if (desired.registryCredentials) {
-    settings.registryCredentials = desired.registryCredentials;
-  }
   if (desired.railwayConfigFile !== current.railwayConfigFile) {
     settings.railwayConfigFile = desired.railwayConfigFile ?? null;
   }
+  if (desired.registryCredentials) {
+    settings.registryCredentials = desired.registryCredentials;
+  }
   if (Object.keys(settings).length > 0) {
     changes.push({
       type: "update-service-settings",
@@ -39835,6 +39898,8 @@ function diffStaticOutboundIps(serviceName, desired, current, changes) {
 }
 
 // src/index.ts
+var require2 = createRequire2(import.meta.url);
+var { version: version2 } = require2("../package.json");
 async function confirm(message) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((res) => {
@@ -39844,7 +39909,21 @@ async function confirm(message) {
     });
   });
 }
-var program2 = new Command().name("railway-deploy").description("Declarative Railway infrastructure management").version("0.1.0").argument("<config>", "Path to environment YAML config file").option("--apply", "Execute changes (default: dry-run)").option("-y, --yes", "Skip confirmation prompts for destructive operations").option("--env-file <path>", "Load .env file for ${VAR} resolution").option("-v, --verbose", "Show detailed diffs (old → new values)").option("--no-color", "Disable ANSI color output").option("--validate", "Validate config without connecting to Railway").action(async (configPath, opts) => {
+var program2 = new Command().name("railway-deploy").description(`Declarative Railway infrastructure management.
+
+Define your Railway services, variables, domains, volumes, and more in YAML,
+and railway-deploy will diff against the live state and apply changes.
+
+Examples:
+  $ railway-deploy environments/production.yaml
+  $ railway-deploy --apply -y environments/staging.yaml
+  $ railway-deploy --validate environments/production.yaml
+  $ railway-deploy --env-file .env --apply environments/production.yaml
+
+Environment:
+  RAILWAY_TOKEN    Railway API token (required for all operations except --validate)
+
+Docs: https://github.com/tachyon-gg/railway-deploy`).version(version2).argument("<config>", "path to environment YAML config file").option("--apply", "execute changes (default is dry-run)").option("--env-file <path>", "load .env file for ${VAR} resolution").option("--no-color", "disable colored output").option("--validate", "validate config without connecting to Railway").option("-v, --verbose", "show detailed diffs with old and new values").option("-y, --yes", "skip confirmation prompts for destructive operations").action(async (configPath, opts) => {
   try {
     await run(configPath, opts);
   } catch (err) {
@@ -39906,7 +39985,7 @@ Fetching current state from Railway...`);
   } = await fetchCurrentState(client, projectId, environmentId);
   console.log(`Found ${Object.keys(currentState.services).length} existing service(s)`);
   const changeset = computeChangeset(desiredState, currentState, deletedVars, deletedSharedVars, domainMap, volumeMap, serviceDomainMap, tcpProxyMap);
-  const noColor = opts.noColor ?? false;
+  const noColor = opts.color === false;
   const verbose = opts.verbose ?? false;
   printChangeset(changeset, {
     verbose,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachyon-gg/railway-deploy",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "type": "module",
   "repository": {
     "type": "git",