@saptools/cf-hana 0.2.0 → 0.2.2

package/dist/cli.js

@@ -4,7 +4,6 @@
 import { Command } from "commander";
 
 // src/backup.ts
-import { createHash, randomUUID } from "crypto";
 import { mkdir, writeFile } from "fs/promises";
 import { homedir } from "os";
 import { join } from "path";
@@ -374,6 +373,28 @@ function findTopLevelKeyword(sql, keyword, startIndex = 0) {
   }
   return void 0;
 }
+function findTopLevelChar(sql, target, startIndex, endIndex) {
+  let index = startIndex;
+  let depth = 0;
+  while (index < endIndex) {
+    const skipped = skipNonCode(sql, index);
+    if (skipped !== void 0) {
+      index = skipped;
+      continue;
+    }
+    const char = sql[index];
+    if (char === target && depth === 0) {
+      return index;
+    }
+    if (char === "(") {
+      depth += 1;
+    } else if (char === ")" && depth > 0) {
+      depth -= 1;
+    }
+    index += 1;
+  }
+  return void 0;
+}
 function selectParamsAfterWhere(statementSql, whereIndex, params) {
   return params.slice(countPlaceholders(statementSql.slice(0, whereIndex)));
 }
@@ -411,6 +432,24 @@ function buildUpdateBackupPlan(statementSql, params) {
     params
   );
 }
+function buildUpsertBackupPlan(statementSql, params) {
+  const upsertIndex = findTopLevelKeyword(statementSql, "UPSERT");
+  const valuesIndex = upsertIndex === void 0 ? void 0 : findTopLevelKeyword(statementSql, "VALUES", upsertIndex + "UPSERT".length);
+  if (upsertIndex === void 0 || valuesIndex === void 0) {
+    throw new QueryError("UPSERT backup requires UPSERT <target> VALUES syntax");
+  }
+  const targetStart = upsertIndex + "UPSERT".length;
+  const columnListIndex = findTopLevelChar(statementSql, "(", targetStart, valuesIndex);
+  const targetEnd = columnListIndex ?? valuesIndex;
+  const whereIndex = findTopLevelKeyword(statementSql, "WHERE", valuesIndex + "VALUES".length);
+  return buildSelectPlan(
+    "upsert",
+    statementSql,
+    statementSql.slice(targetStart, targetEnd),
+    whereIndex,
+    params
+  );
+}
 function buildDeleteBackupPlan(statementSql, params) {
   const deleteIndex = findTopLevelKeyword(statementSql, "DELETE");
   const fromIndex = deleteIndex === void 0 ? void 0 : findTopLevelKeyword(statementSql, "FROM", deleteIndex + "DELETE".length);
@@ -430,8 +469,18 @@ function buildDeleteBackupPlan(statementSql, params) {
 function backupTimestamp(now) {
   return now.toISOString().replace(/:/g, "").replace(".", "");
 }
-function backupHash(statementSql) {
-  return createHash("sha256").update(statementSql).update("\0").update(randomUUID()).digest("hex").slice(0, 12);
+function backupMonth(now) {
+  const year = String(now.getUTCFullYear());
+  const month = String(now.getUTCMonth() + 1).padStart(2, "0");
+  return `${year}${month}`;
+}
+function sanitizePathPart(value) {
+  const trimmed = value?.trim() ?? "";
+  const normalized = trimmed.replace(/[^A-Za-z0-9._-]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+  return normalized.length > 0 ? normalized : "unknown-target";
+}
+function backupBaseName(input, now) {
+  return [sanitizePathPart(input.selector), input.operation, backupTimestamp(now)].join("-");
 }
 function cfHanaBackupRoot(saptoolsRoot) {
   return join(saptoolsRoot ?? defaultSaptoolsRoot(), CF_HANA_DIR_NAME, BACKUPS_DIR_NAME);
@@ -439,33 +488,49 @@ function cfHanaBackupRoot(saptoolsRoot) {
 function buildWriteBackupPlan(sql, params = []) {
   const statementSql = trimStatementSql(sql);
   const keyword = firstKeyword(statementSql);
-  if (keyword !== "UPDATE" && keyword !== "DELETE") {
+  if (keyword !== "UPDATE" && keyword !== "UPSERT" && keyword !== "DELETE") {
     return void 0;
   }
   assertParamArity(statementSql, params);
   if (keyword === "UPDATE") {
     return buildUpdateBackupPlan(statementSql, params);
   }
+  if (keyword === "UPSERT") {
+    return buildUpsertBackupPlan(statementSql, params);
+  }
   return buildDeleteBackupPlan(statementSql, params);
 }
 async function writeSqlBackup(input, options = {}) {
   const now = options.now ?? /* @__PURE__ */ new Date();
-  const directory = join(
-    cfHanaBackupRoot(options.saptoolsRoot),
-    `${backupTimestamp(now)}-${input.operation}-${backupHash(input.statementSql)}`
-  );
-  const statementPath = join(directory, "statement.sql");
-  const backupPath = join(directory, "backup.csv");
+  const directory = join(cfHanaBackupRoot(options.saptoolsRoot), backupMonth(now));
+  const baseName = backupBaseName(input, now);
+  const statementPath = join(directory, `${baseName}.statement.sql`);
+  const backupPath = join(directory, `${baseName}.sql`);
+  const metadataPath = join(directory, `${baseName}.json`);
+  const metadata = {
+    selector: input.selector ?? null,
+    operation: input.operation,
+    statementPath,
+    backupPath,
+    rowCount: input.result.rowCount,
+    createdAt: now.toISOString()
+  };
   await mkdir(directory, { recursive: true, mode: 448 });
   await Promise.all([
     writeFile(statementPath, `${input.statementSql}
 `, { encoding: "utf8", mode: 384 }),
-    writeFile(backupPath, formatCsv(input.result), { encoding: "utf8", mode: 384 })
+    writeFile(backupPath, formatCsv(input.result), { encoding: "utf8", mode: 384 }),
+    writeFile(metadataPath, `${JSON.stringify(metadata, null, 2)}
+`, {
+      encoding: "utf8",
+      mode: 384
+    })
   ]);
   return {
     directory,
     statementPath,
     backupPath,
+    metadataPath,
     rowCount: input.result.rowCount
   };
 }
@@ -587,7 +652,7 @@ async function listColumns(connection, schema, table) {
 
 // src/config.ts
 var CLI_NAME = "cf-hana";
-var CLI_VERSION = "0.2.0";
+var CLI_VERSION = "0.2.1";
 var ENV_PREFIX = "CF_HANA";
 var DEFAULT_QUERY_TIMEOUT_MS = 3e4;
 var DEFAULT_CONNECT_TIMEOUT_MS = 3e4;
@@ -619,44 +684,381 @@ function readSapCredentials(overrides) {
   return { email, password };
 }
 
-// src/credentials.ts
-import { fetchAppDbBindings, readDbAppView } from "@saptools/cf-sync";
-async function resolveAppBindings(selector, options) {
-  if (options.refresh !== true) {
-    const view = await readDbAppView(selector);
-    if (view !== void 0 && view.entry.bindings.length > 0) {
-      return {
-        selector: view.entry.selector,
-        appName: view.entry.appName,
-        bindings: view.entry.bindings,
-        source: "cache"
-      };
+// src/cf.ts
+import { execFile } from "child_process";
+import { mkdtemp, rm } from "fs/promises";
+import { tmpdir } from "os";
+import { join as join2 } from "path";
+import { promisify } from "util";
+var execFileAsync = promisify(execFile);
+var MAX_BUFFER = 16 * 1024 * 1024;
+var DEFAULT_TIMEOUT_MS = 3e4;
+var CF_RETRY_ATTEMPTS = 3;
+var CF_RETRY_BASE_DELAY_MS = 120;
+var REGION_API_MAP = {
+  ae01: "https://api.cf.ae01.hana.ondemand.com",
+  ap01: "https://api.cf.ap01.hana.ondemand.com",
+  ap10: "https://api.cf.ap10.hana.ondemand.com",
+  ap11: "https://api.cf.ap11.hana.ondemand.com",
+  ap12: "https://api.cf.ap12.hana.ondemand.com",
+  ap20: "https://api.cf.ap20.hana.ondemand.com",
+  ap21: "https://api.cf.ap21.hana.ondemand.com",
+  ap30: "https://api.cf.ap30.hana.ondemand.com",
+  br10: "https://api.cf.br10.hana.ondemand.com",
+  br20: "https://api.cf.br20.hana.ondemand.com",
+  br30: "https://api.cf.br30.hana.ondemand.com",
+  ca10: "https://api.cf.ca10.hana.ondemand.com",
+  ca20: "https://api.cf.ca20.hana.ondemand.com",
+  ch20: "https://api.cf.ch20.hana.ondemand.com",
+  eu10: "https://api.cf.eu10.hana.ondemand.com",
+  eu11: "https://api.cf.eu11.hana.ondemand.com",
+  eu12: "https://api.cf.eu12.hana.ondemand.com",
+  eu20: "https://api.cf.eu20.hana.ondemand.com",
+  eu21: "https://api.cf.eu21.hana.ondemand.com",
+  eu30: "https://api.cf.eu30.hana.ondemand.com",
+  "eu10-002": "https://api.cf.eu10-002.hana.ondemand.com",
+  jp10: "https://api.cf.jp10.hana.ondemand.com",
+  jp20: "https://api.cf.jp20.hana.ondemand.com",
+  jp30: "https://api.cf.jp30.hana.ondemand.com",
+  us10: "https://api.cf.us10.hana.ondemand.com",
+  us11: "https://api.cf.us11.hana.ondemand.com",
+  us20: "https://api.cf.us20.hana.ondemand.com",
+  us21: "https://api.cf.us21.hana.ondemand.com",
+  us30: "https://api.cf.us30.hana.ondemand.com",
+  in30: "https://api.cf.in30.hana.ondemand.com"
+};
+function getApiEndpointForRegion(regionKey) {
+  return REGION_API_MAP[regionKey];
+}
+function getRegionKeyForApi(apiEndpoint) {
+  const norm = apiEndpoint.trim().replace(/\/+$/, "").toLowerCase();
+  for (const [key, endpoint] of Object.entries(REGION_API_MAP)) {
+    if (endpoint.toLowerCase() === norm) {
+      return key;
+    }
+  }
+  return void 0;
+}
+async function withCfSession(work) {
+  const cfHome = await mkdtemp(join2(tmpdir(), "saptools-cf-hana-"));
+  const ctx = { cfHome };
+  try {
+    return await work(ctx);
+  } finally {
+    await rm(cfHome, { recursive: true, force: true });
+  }
+}
+function resolveCfBin() {
+  const raw = process.env["CF_HANA_CF_BIN"] ?? "cf";
+  if (/\.(?:c|m)?js$/i.test(raw)) {
+    return { bin: process.execPath, argsPrefix: [raw] };
+  }
+  return { bin: raw, argsPrefix: [] };
+}
+function buildEnv(ctx, overrides = {}) {
+  const env = { ...process.env, ...overrides };
+  delete env["SAP_EMAIL"];
+  delete env["SAP_PASSWORD"];
+  env["CF_HOME"] = ctx.cfHome;
+  return env;
+}
+async function runCf(args, ctx, overrides = {}) {
+  const { bin, argsPrefix } = resolveCfBin();
+  const env = buildEnv(ctx, overrides);
+  let lastErr;
+  for (let attempt = 0; attempt < CF_RETRY_ATTEMPTS; attempt++) {
+    try {
+      const { stdout } = await execFileAsync(bin, [...argsPrefix, ...args], {
+        env,
+        maxBuffer: MAX_BUFFER,
+        timeout: DEFAULT_TIMEOUT_MS
+      });
+      return stdout;
+    } catch (err) {
+      lastErr = err;
+      if (attempt < CF_RETRY_ATTEMPTS - 1) {
+        await new Promise((r) => setTimeout(r, CF_RETRY_BASE_DELAY_MS * (attempt + 1)));
+      }
     }
   }
-  const credentials = readSapCredentials({
-    email: options.email,
-    password: options.password
+  const e = lastErr;
+  const detail = e?.stderr ? String(e.stderr) : e?.message ?? "";
+  const cmd = args[0] === "auth" ? "cf auth" : `cf ${args.join(" ")}`;
+  throw new Error(`${cmd} failed: ${detail}`.trim(), { cause: lastErr });
+}
+async function cfApi(apiEndpoint, ctx) {
+  await runCf(["api", apiEndpoint], ctx);
+}
+async function cfAuth(email, password, ctx) {
+  await runCf(["auth"], ctx, {
+    CF_USERNAME: email,
+    CF_PASSWORD: password
   });
-  if (credentials === void 0) {
-    throw new CredentialsNotFoundError(
-      `No cached HANA credentials for "${selector}". Run \`cf-sync db-sync ${selector}\` first, or set SAP_EMAIL and SAP_PASSWORD to fetch them live.`
+}
+async function cfTargetSpace(orgName, spaceName, ctx) {
+  await runCf(["target", "-o", orgName, "-s", spaceName], ctx);
+}
+async function cfEnv(appName, ctx) {
+  return await runCf(["env", appName], ctx);
+}
+async function cfEnvDirect(appName) {
+  const { bin, argsPrefix } = resolveCfBin();
+  const env = { ...process.env };
+  delete env["SAP_EMAIL"];
+  delete env["SAP_PASSWORD"];
+  const { stdout } = await execFileAsync(bin, [...argsPrefix, "env", appName], {
+    env,
+    maxBuffer: MAX_BUFFER,
+    timeout: DEFAULT_TIMEOUT_MS
+  });
+  return stdout;
+}
+async function readCurrentCfTarget() {
+  const { bin, argsPrefix } = resolveCfBin();
+  const env = { ...process.env };
+  delete env["SAP_EMAIL"];
+  delete env["SAP_PASSWORD"];
+  try {
+    const { stdout } = await execFileAsync(bin, [...argsPrefix, "target"], {
+      env,
+      maxBuffer: MAX_BUFFER,
+      timeout: 1e4
+    });
+    return parseCfTargetOutput(stdout);
+  } catch {
+    return void 0;
+  }
+}
+function parseCfTargetOutput(stdout) {
+  const fields = parseTargetFields(stdout);
+  const api = fields.get("api endpoint");
+  const org = fields.get("org");
+  const space = fields.get("space");
+  if (!api || !org || !space) {
+    return void 0;
+  }
+  const regionKey = getRegionKeyForApi(api);
+  return {
+    apiEndpoint: api,
+    orgName: org,
+    spaceName: space,
+    ...regionKey ? { regionKey } : {}
+  };
+}
+function parseTargetFields(stdout) {
+  const map = /* @__PURE__ */ new Map();
+  for (const line of stdout.split(/\r?\n/)) {
+    const idx = line.indexOf(":");
+    if (idx < 0) {
+      continue;
+    }
+    const key = line.slice(0, idx).trim().toLowerCase();
+    const val = line.slice(idx + 1).trim();
+    if (key && val) {
+      map.set(key, val);
+    }
+  }
+  return map;
+}
+function formatCurrentCfAppSelector(target, appName) {
+  const name = appName.trim();
+  if (!name) {
+    throw new Error("App name is required.");
+  }
+  if (!target.regionKey) {
+    throw new Error(
+      `Current CF API endpoint "${target.apiEndpoint}" does not match a known SAP region. Pass a full region/org/space/app selector.`
     );
   }
-  const fetched = await fetchAppDbBindings({
-    selector,
-    email: credentials.email,
-    password: credentials.password
+  return `${target.regionKey}/${target.orgName}/${target.spaceName}/${name}`;
+}
+function extractVcapSection(stdout) {
+  const start = stdout.indexOf("VCAP_SERVICES:");
+  if (start === -1) {
+    throw new Error("VCAP_SERVICES section not found in cf env output");
+  }
+  const after = stdout.slice(start + "VCAP_SERVICES:".length);
+  const end = after.indexOf("VCAP_APPLICATION:");
+  const block = end === -1 ? after : after.slice(0, end);
+  return block.trim();
+}
+function isRecord(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function assertCreds(raw) {
+  if (!isRecord(raw)) {
+    throw new Error("HANA credentials must be an object");
+  }
+  const req = ["host", "port", "user", "password", "schema", "hdi_user", "hdi_password", "url", "database_id", "certificate"];
+  for (const k of req) {
+    if (typeof raw[k] !== "string") {
+      throw new Error(`Missing/invalid HANA credential field: "${k}"`);
+    }
+  }
+  return raw;
+}
+function mapCreds(raw) {
+  return {
+    host: raw.host,
+    port: raw.port,
+    user: raw.user,
+    password: raw.password,
+    schema: raw.schema,
+    hdiUser: raw.hdi_user,
+    hdiPassword: raw.hdi_password,
+    ...raw.url ? { url: raw.url } : {},
+    databaseId: raw.database_id,
+    certificate: raw.certificate
+  };
+}
+function extractHanaBindingsFromCfEnv(stdout) {
+  const jsonText = extractVcapSection(stdout);
+  let vcap;
+  try {
+    vcap = JSON.parse(jsonText);
+  } catch {
+    throw new Error("VCAP_SERVICES is not valid JSON");
+  }
+  if (!isRecord(vcap)) {
+    throw new Error("VCAP_SERVICES must be an object");
+  }
+  const hana = vcap["hana"];
+  if (hana === void 0) {
+    return [];
+  }
+  if (!Array.isArray(hana)) {
+    throw new Error("VCAP_SERVICES.hana must be an array when present");
+  }
+  return hana.map((b) => {
+    if (!isRecord(b)) {
+      throw new Error("HANA binding must be an object");
+    }
+    const credsRaw = assertCreds(b["credentials"]);
+    const name = typeof b["name"] === "string" ? b["name"] : void 0;
+    return {
+      ...name ? { name } : {},
+      credentials: mapCreds(credsRaw)
+    };
   });
-  if (fetched.bindings.length === 0) {
-    throw new CredentialsNotFoundError(
-      `App "${fetched.selector}" has no HANA service binding.`
-    );
+}
+function classifyCfError(stderr = "", stdout = "") {
+  const text = `${stderr} ${stdout}`.toLowerCase();
+  if (text.includes("not logged in") || text.includes("unauthorized") || text.includes("forbidden") || text.includes("credentials were rejected") || text.includes("authentication failed") || text.includes("cf auth") || text.includes("token") || text.includes("expired") || text.includes("session")) {
+    return { isAuthError: true, reason: "auth/session issue" };
+  }
+  return { isAuthError: false, reason: "" };
+}
+
+// src/credentials.ts
+async function resolveAppBindings(rawSelector, options) {
+  const selector = rawSelector.trim();
+  if (!selector) {
+    throw new CfHanaError("CONFIG", "App selector is required");
+  }
+  let target;
+  const isBare = !selector.includes("/");
+  if (isBare) {
+    const current = await readCurrentCfTarget();
+    if (!current) {
+      throw new CfHanaError(
+        "CONFIG",
+        "No current CF target found. Run `cf target -o <org> -s <space>` or pass a full region/org/space/app selector."
+      );
+    }
+    const displaySelector = current.regionKey ? formatCurrentCfAppSelector(current, selector) : `current/${current.orgName}/${current.spaceName}/${selector}`;
+    target = {
+      selector: displaySelector,
+      apiEndpoint: current.regionKey ? getApiEndpointForRegion(current.regionKey) : void 0,
+      orgName: current.orgName,
+      spaceName: current.spaceName,
+      appName: selector
+    };
+  } else {
+    const parts = selector.split("/").map((p) => p.trim());
+    if (parts.length !== 4 || !parts[0] || !parts[1] || !parts[2] || !parts[3]) {
+      throw new CfHanaError(
+        "CONFIG",
+        `Invalid selector "${selector}". Use region/org/space/app or a bare app name.`
+      );
+    }
+    const [regionKey, orgName, spaceName, appName] = parts;
+    const apiEndpoint = getApiEndpointForRegion(regionKey);
+    if (!apiEndpoint) {
+      throw new CfHanaError(
+        "CONFIG",
+        `Unknown region key "${regionKey}". Use a known region or the current CF target.`
+      );
+    }
+    target = { selector, apiEndpoint, orgName, spaceName, appName };
+  }
+  let bindings;
+  const source = "live";
+  if (isBare) {
+    try {
+      const stdout = await cfEnvDirect(target.appName);
+      bindings = extractHanaBindingsFromCfEnv(stdout);
+    } catch (directError) {
+      let stderr = "";
+      if (directError && typeof directError === "object") {
+        const e = directError;
+        stderr = (typeof e.stderr === "string" ? e.stderr : "") || (typeof e.message === "string" ? e.message : "");
+      }
+      const classified = classifyCfError(stderr);
+      if (classified.isAuthError) {
+        const sap = readSapCredentials({ email: options.email, password: options.password });
+        if (!sap) {
+          throw new CredentialsNotFoundError(
+            `Current CF session problem for bare app "${target.appName}" (${classified.reason}).
+Run "cf login" + "cf target", or provide SAP_EMAIL + SAP_PASSWORD.`,
+            { cause: directError }
+          );
+        }
+        if (!target.apiEndpoint) {
+          throw new CfHanaError("CONFIG", "Cannot determine API endpoint for fallback auth.");
+        }
+        const api = target.apiEndpoint;
+        bindings = await withCfSession(async (ctx) => {
+          await cfApi(api, ctx);
+          await cfAuth(sap.email, sap.password, ctx);
+          await cfTargetSpace(target.orgName, target.spaceName, ctx);
+          const stdout = await cfEnv(target.appName, ctx);
+          return extractHanaBindingsFromCfEnv(stdout);
+        });
+      } else {
+        throw new CfHanaError(
+          "CONFIG",
+          `Failed to get HANA bindings for bare app "${target.appName}" using current target (org=${target.orgName}, space=${target.spaceName}). Verify with "cf target" and "cf env ${target.appName}". ${stderr ? `Details: ${stderr}` : ""}`,
+          { cause: directError }
+        );
+      }
+    }
+  } else {
+    const sap = readSapCredentials({ email: options.email, password: options.password });
+    if (!sap) {
+      throw new CredentialsNotFoundError(
+        `SAP_EMAIL and SAP_PASSWORD are required to fetch HANA bindings for explicit selector "${selector}".`
+      );
+    }
+    if (!target.apiEndpoint) {
+      throw new CfHanaError("CONFIG", "Invalid explicit selector.");
+    }
+    const api = target.apiEndpoint;
+    bindings = await withCfSession(async (ctx) => {
+      await cfApi(api, ctx);
+      await cfAuth(sap.email, sap.password, ctx);
+      await cfTargetSpace(target.orgName, target.spaceName, ctx);
+      const stdout = await cfEnv(target.appName, ctx);
+      return extractHanaBindingsFromCfEnv(stdout);
+    });
+  }
+  if (bindings.length === 0) {
+    throw new CredentialsNotFoundError(`App "${target.selector}" has no HANA service binding.`);
   }
   return {
-    selector: fetched.selector,
-    appName: fetched.appName,
-    bindings: fetched.bindings,
-    source: "fresh"
+    selector: target.selector,
+    appName: target.appName,
+    bindings,
+    source
   };
 }
 function selectBinding(bindings, selector) {
@@ -706,7 +1108,7 @@ function toConnectionTarget(binding, role) {
     password: role === "hdi" ? credentials.hdiPassword : credentials.password,
     schema: credentials.schema,
     certificate: credentials.certificate,
-    databaseId: credentials.databaseId
+    databaseId: credentials.databaseId ?? ""
   };
 }
 
@@ -1033,16 +1435,16 @@ function createDriver(name) {
 }
 
 // src/history.ts
-import { appendFile as appendFile2, mkdir as mkdir2, readdir, rm } from "fs/promises";
+import { appendFile as appendFile2, mkdir as mkdir2, readdir, rm as rm2 } from "fs/promises";
 import { homedir as homedir2 } from "os";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 var SAPTOOLS_DIR_NAME2 = ".saptools";
 var CF_HANA_DIR_NAME2 = "cf-hana";
 var HISTORIES_DIR_NAME = "histories";
 var HISTORY_RETENTION_DAYS = 5;
 var HISTORY_FILE_PATTERN = /^\d{4}-\d{2}-\d{2}\.jsonl$/;
 function defaultSaptoolsRoot2() {
-  return join2(homedir2(), SAPTOOLS_DIR_NAME2);
+  return join3(homedir2(), SAPTOOLS_DIR_NAME2);
 }
 function padDatePart(value) {
   return value.toString().padStart(2, "0");
@@ -1064,10 +1466,10 @@ function resolveSaptoolsRoot(root) {
   return root ?? defaultSaptoolsRoot2();
 }
 function cfHanaHistoryDirectory(saptoolsRoot) {
-  return join2(resolveSaptoolsRoot(saptoolsRoot), CF_HANA_DIR_NAME2, HISTORIES_DIR_NAME);
+  return join3(resolveSaptoolsRoot(saptoolsRoot), CF_HANA_DIR_NAME2, HISTORIES_DIR_NAME);
 }
 function sqlHistoryFilePath(now = /* @__PURE__ */ new Date(), saptoolsRoot) {
-  return join2(cfHanaHistoryDirectory(saptoolsRoot), `${dateKey(now)}.jsonl`);
+  return join3(cfHanaHistoryDirectory(saptoolsRoot), `${dateKey(now)}.jsonl`);
 }
 async function pruneSqlHistory(now, saptoolsRoot) {
   const historyDir = cfHanaHistoryDirectory(saptoolsRoot);
@@ -1083,7 +1485,7 @@ async function pruneSqlHistory(now, saptoolsRoot) {
   const cutoffKey = retentionCutoffKey(now);
   await Promise.all(
     files.filter((file) => HISTORY_FILE_PATTERN.test(file)).filter((file) => file.slice(0, 10) < cutoffKey).map(async (file) => {
-      await rm(join2(historyDir, file), { force: true });
+      await rm2(join3(historyDir, file), { force: true });
     })
   );
 }
@@ -1654,7 +2056,8 @@ var HanaClient = class _HanaClient {
       return await writeSqlBackup({
         operation: plan.operation,
         statementSql: plan.statementSql,
-        result
+        result,
+        selector: this.info.selector
       });
     });
   }
@@ -2065,19 +2468,19 @@ function searchResultSession(session, searchTerm, options) {
 
 // src/result-store.ts
 import { randomBytes } from "crypto";
-import { mkdir as mkdir3, readFile, readdir as readdir2, rename, rm as rm2, writeFile as writeFile2 } from "fs/promises";
+import { mkdir as mkdir3, readFile, readdir as readdir2, rename, rm as rm3, writeFile as writeFile2 } from "fs/promises";
 import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 var RESULT_REF_PATTERN = /^q[0-9a-f]{8}$/;
 var MANIFEST_FILE_NAME = "manifest.json";
 function resultsRoot(saptoolsRoot) {
-  return join3(saptoolsRoot ?? join3(homedir3(), ".saptools"), "cf-hana", "results");
+  return join4(saptoolsRoot ?? join4(homedir3(), ".saptools"), "cf-hana", "results");
 }
 function sessionDirectory(ref, saptoolsRoot) {
-  return join3(resultsRoot(saptoolsRoot), ref);
+  return join4(resultsRoot(saptoolsRoot), ref);
 }
 function manifestPath(ref, saptoolsRoot) {
-  return join3(sessionDirectory(ref, saptoolsRoot), MANIFEST_FILE_NAME);
+  return join4(sessionDirectory(ref, saptoolsRoot), MANIFEST_FILE_NAME);
 }
 function encodeCell(value) {
   if (value === null) {
@@ -2176,11 +2579,11 @@ function toStoredSession(input, ref, now) {
     result: encodeResult(input.result)
   };
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isStoredSession(value) {
-  if (!isRecord(value) || !isRecord(value["result"]) || !isRecord(value["info"])) {
+  if (!isRecord2(value) || !isRecord2(value["result"]) || !isRecord2(value["info"])) {
     return false;
   }
   const result = value["result"];
@@ -2229,16 +2632,16 @@ async function createResultSession(input, options = {}) {
   const finalDirectory = sessionDirectory(ref, options.saptoolsRoot);
   const tempDirectory = `${finalDirectory}.tmp-${process.pid.toString()}`;
   await mkdir3(root, { recursive: true, mode: 448 });
-  await rm2(tempDirectory, { recursive: true, force: true });
+  await rm3(tempDirectory, { recursive: true, force: true });
   await mkdir3(tempDirectory, { mode: 448 });
   try {
-    await writeFile2(join3(tempDirectory, MANIFEST_FILE_NAME), serialized, {
+    await writeFile2(join4(tempDirectory, MANIFEST_FILE_NAME), serialized, {
       encoding: "utf8",
       mode: 384
     });
     await rename(tempDirectory, finalDirectory);
   } catch (error) {
-    await rm2(tempDirectory, { recursive: true, force: true });
+    await rm3(tempDirectory, { recursive: true, force: true });
     throw error;
   }
   return toSession(stored, options.saptoolsRoot);
@@ -2274,7 +2677,7 @@ async function pruneResultSessions(options = {}) {
   for (const ref of refs) {
     const stored = await readStoredSession(manifestPath(ref, options.saptoolsRoot));
     if (stored === void 0 || Date.parse(stored.expiresAt) <= now) {
-      await rm2(sessionDirectory(ref, options.saptoolsRoot), { recursive: true, force: true });
+      await rm3(sessionDirectory(ref, options.saptoolsRoot), { recursive: true, force: true });
       removed += 1;
     }
   }
@@ -2284,7 +2687,7 @@ async function clearResultSessions(options = {}) {
   const refs = await listSessionRefs(options.saptoolsRoot);
   await Promise.all(
     refs.map(async (ref) => {
-      await rm2(sessionDirectory(ref, options.saptoolsRoot), { recursive: true, force: true });
+      await rm3(sessionDirectory(ref, options.saptoolsRoot), { recursive: true, force: true });
     })
   );
   return refs.length;
@@ -2544,6 +2947,25 @@ function parseQualifiedName(value) {
   }
   return { schema: value.slice(0, dot), table: value.slice(dot + 1) };
 }
+async function resolveSelectorArgument(selector) {
+  if (selector.includes("/")) {
+    return selector;
+  }
+  const current = await readCurrentCfTarget().catch((error) => {
+    throw new CfHanaError(
+      "CONFIG",
+      "No current CF target found. Run `cf target -o <org> -s <space>` or pass a full region/org/space/app selector.",
+      { cause: error }
+    );
+  });
+  if (current === void 0) {
+    throw new CfHanaError(
+      "CONFIG",
+      "No current CF target found. Run `cf target -o <org> -s <space>` or pass a full region/org/space/app selector."
+    );
+  }
+  return formatCurrentCfAppSelector(current, selector);
+}
 function toConnectOptions(opts) {
   assertPositiveOption("--limit", opts.limit);
   assertPositiveOption("--timeout", opts.timeout);
@@ -2611,7 +3033,7 @@ async function runQuery(selector, sql, command) {
   const opts = command.opts();
   assertQueryOptions(sql, opts);
   const cellLimit = resolveCellLimit(opts.cellLimit);
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const params = opts.param ?? [];
     const backup = await client.backupWriteStatement(sql, params);
@@ -2652,7 +3074,7 @@ async function runQuery(selector, sql, command) {
 }
 async function runTables(selector, schema, command) {
   const opts = command.opts();
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const tables = await client.listTables(schema ?? client.info.schema);
     const rows = tables.map((table) => ({
@@ -2668,7 +3090,7 @@ async function runTables(selector, schema, command) {
 async function runColumns(selector, target, command) {
   const opts = command.opts();
   const { schema, table } = parseQualifiedName(target);
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const columns = await client.listColumns(schema, table);
     const rows = columns.map((column) => ({
@@ -2686,7 +3108,7 @@ async function runColumns(selector, target, command) {
 async function runCount(selector, target, command) {
   const opts = command.opts();
   const { schema, table } = parseQualifiedName(target);
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const total = await client.count({ schema, table });
     print2(String(total));
@@ -2696,7 +3118,7 @@ async function runCount(selector, target, command) {
 }
 async function runPing(selector, command) {
   const opts = command.opts();
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const started = Date.now();
     await client.query("SELECT 1 FROM DUMMY");
@@ -2709,7 +3131,7 @@ async function runPing(selector, command) {
 }
 async function runInfo(selector, command) {
   const opts = command.opts();
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     print2(formatInfo(client.info));
   } finally {