@cspeach/cli 1.1.42 → 1.1.43

package/.cspeach/project.json

@@ -1,4 +1,4 @@
 {
-  "id": "1a6ac3e6",
-  "createdAt": "2026-10-16T13:54:35.800Z"
+  "id": "4d0ce47b",
+  "createdAt": "2026-10-16T21:06:21.305Z"
 }

package/dist/approvals/op-labels.js

@@ -42,6 +42,9 @@ const TYPE_WORDS = {
     ENHS: 'BAdI enhancement spot',
     XSLT: 'transformation',
     SHLP: 'search help',
+    FUNC: 'function module',
+    FINC: 'function group include',
+    INCL: 'include',
 };
 export function humanVerb(op) {
     return VERBS[op] ?? op.charAt(0).toUpperCase() + op.slice(1);
@@ -68,12 +71,18 @@ export function verbLine(change) {
         .filter(Boolean)
         .join(' ');
 }
+/** Part 2c D20 — the fixed card line for a function-group delete. */
+const FUGR_DELETE_LINE = 'Deletes every function module and include in the group.';
 /**
  * Part 2b D7 — "Affects: <process>" for a change that names the standard SAP
  * process it runs in (a BAdI implementation); null when it names none. The
  * text comes from the model: control characters are removed.
  */
 export function affectsLine(change) {
+    // Part 2c D20 — a group delete takes every module and include with it. The
+    // line comes from the change's op and type, never from a model-supplied field.
+    if (change.op === 'delete' && typeCode(change.type) === 'FUGR')
+        return FUGR_DELETE_LINE;
     const t = sanitizeControlChars(String(change.affects ?? '')).trim();
     return t ? `Affects: ${t}` : null;
 }

package/dist/renderer/tool-labels.js

@@ -170,6 +170,9 @@ const RULES = {
     sap_badi_read: (a) => ({ verb: 'Read BAdI', object: shortRight([str(a['kind']), str(a['name'])].filter(Boolean).join(' ')) }),
     sap_enhancement_options: (a) => ({ verb: 'Read enhancement options', object: shortRight([str(a['type']), str(a['name'])].filter(Boolean).join(' ')) }),
     sap_create_badi_implementation: sapObject('Created BAdI implementation'),
+    sap_create_table_type: sapObject('Created table type'),
+    sap_table_type_read: sapObject('Read table type'),
+    sap_function_group_list: (a) => ({ verb: 'Listed function group', object: shortRight(str(a['group']) ?? '') }),
     sap_snapshot_list: (a) => ({ verb: 'Listed snapshots', object: shortRight(str(a['name']) ?? '') }),
     sap_snapshot_read: sapObject('Read snapshot'),
     sap_snapshot_cleanup: () => ({ verb: 'Cleaned snapshots', object: '' }),
@@ -268,7 +271,7 @@ const PRESENT = {
     'Read snapshot': 'Reading snapshot of', 'Cleaned snapshots': 'Cleaning snapshots',
     'Created transport': 'Creating transport', 'Transport for': 'Finding transport for',
     'Listed transports': 'Listing transports', Released: 'Releasing', 'Created domain': 'Creating domain',
-    'Created data element': 'Creating data element', 'Read BAdI': 'Reading BAdI', 'Read enhancement options': 'Reading enhancement options of', 'Created BAdI implementation': 'Creating BAdI implementation', Locked: 'Locking', Unlocked: 'Unlocking',
+    'Created data element': 'Creating data element', 'Read BAdI': 'Reading BAdI', 'Read enhancement options': 'Reading enhancement options of', 'Created BAdI implementation': 'Creating BAdI implementation', 'Created table type': 'Creating table type', 'Read table type': 'Reading table type', 'Listed function group': 'Listing function group', Locked: 'Locking', Unlocked: 'Unlocking',
     Published: 'Publishing', Unpublished: 'Unpublishing', Messages: 'Maintaining messages in',
     'Number range': 'Maintaining number range', Question: 'Asking', 'Updated todos': 'Updating todos',
     'Ran skill': 'Running skill', 'Read document': 'Reading document', Fetched: 'Fetching',

package/dist/sap/profile-features.js

@@ -30,6 +30,11 @@ export const FEATURES = Object.freeze({
     // 2020" has no cited source (Part 1 I1 rule): listed = yes, else unknown.
     'enh.badiImplementations': { label: 'BAdI implementations', collection: `${A}/enhancements/enhoxhb`, provenOnOurBox: true },
     'enh.badiSpots': { label: 'BAdI enhancement spots', collection: `${A}/enhancements/enhsxsb`, provenOnOurBox: true },
+    // Part 2c: no `since`. The gap table says "all on-prem", unverified (Part 1
+    // I1 rule): listed = yes, else unknown.
+    'fugr.modules': { label: 'Function modules and function-group includes', collection: `${A}/functions/groups`, provenOnOurBox: true },
+    'prog.includes': { label: 'Program includes', collection: `${A}/programs/includes`, provenOnOurBox: true },
+    'ddic.tabletypes': { label: 'Table types', collection: `${A}/ddic/tabletypes`, provenOnOurBox: true },
 });
 export const FEATURE_IDS = Object.freeze(Object.keys(FEATURES));
 export function isFeatureId(s) {
@@ -42,6 +47,7 @@ export const OBJECT_TYPE_FEATURE = Object.freeze({
     TABL: 'ddic.tables', STRU: 'ddic.structures', DOMA: 'ddic.domains', DTEL: 'ddic.dataelements',
     MSAG: 'msag', NROB: 'nrob',
     ENHO: 'enh.badiImplementations', ENHS: 'enh.badiSpots',
+    FUNC: 'fugr.modules', FINC: 'fugr.modules', INCL: 'prog.includes', TTYP: 'ddic.tabletypes',
 });
 /** The RAP/CDS subset: the only types a READ is ever refused for (R6). */
 export const READ_GATED_TYPES = new Set(['BDEF', 'SRVD', 'SRVB', 'DDLS', 'CDS', 'DDLX', 'DCLS']);

package/dist/tools/sap-read.js

@@ -1,5 +1,5 @@
 /**
- * 18 read-only SAP tools wired to @cspeach/sap-client AdtClient.
+ * Read-only SAP tools wired to @cspeach/sap-client AdtClient.
  *
  * All method names verified against sap-client/src/adt-client.ts:
  *   getSource(type, name)
@@ -22,13 +22,14 @@
  *   badiList(query, enhancementSpot?, maxResults?)
  *   readBadiSpot(name) / readBadiImplementation(name)   (Part 2b)
  *   enhancementOptions(type, name)                      (Part 2b)
+ *   readTableType(name) / functionGroupMembers(group) / includeMainPrograms(name)  (Part 2c)
  */
 import { registerTool } from './index.js';
 import { byObjectTypeForRead } from '../sap/profile-gate.js';
 import { normaliseSyntaxResult, checkSyntax } from './verify.js';
 import { recordSyntaxCheck } from './syntax-state.js';
 import { spillToolResult } from './result-spill.js';
-import { SapError } from '@cspeach/sap-client';
+import { SapError, parseFunctionModuleDocument, parseContainerDocument } from '@cspeach/sap-client';
 // -----------------------------------------------------------------------
 // Task 17 (spec D12, ruling F18) — model-facing formats.
 // -----------------------------------------------------------------------
@@ -84,7 +85,9 @@ registerTool({
         + 'caller knows the inactive edits are not visible. For a freshly '
         + 'created object with NO active version yet, the inactive (working) '
         + 'source is returned with version="inactive" and an honest note. '
-        + 'The first line is a [version: …] header, not part of the source.',
+        + 'The first line is a [version: …] header, not part of the source. '
+        + 'Types FUNC (function module), FINC (function-group include, e.g. L<GROUP>TOP), INCL (program include) and TTYP (table type) are supported; give the bare name — CSPeach finds the group.' + ' '
+        + 'A table type has no source: use sap_table_type_read.',
     isMutating: false,
     requiresSap: true,
     input_schema: {
@@ -180,7 +183,8 @@ registerTool({
 registerTool({
     name: 'sap_object_structure',
     requires: byObjectTypeForRead,
-    description: 'Retrieve metadata and structural information for an ABAP repository object (package, description, lock state, etc.).',
+    description: 'Retrieve metadata and structural information for an ABAP repository object (package, description, lock state, etc.). '
+        + 'Types FUNC (function module), FINC (function-group include, e.g. L<GROUP>TOP), INCL (program include) and TTYP (table type) are supported; give the bare name — CSPeach finds the group.',
     isMutating: false,
     requiresSap: true,
     input_schema: {
@@ -208,10 +212,51 @@ registerTool({
         // the excerpt window. Task 17: rawXml is parsed above and never sent to
         // the model (it was the bulk of the result).
         const { name, type, rawXml, ...rest } = result;
-        void rawXml;
-        return { content: JSON.stringify({ name, type, version, ...rest }, null, 2) };
+        // Part 2c (D18) — after `version`: the module document's group, processing
+        // type and release state; an include's group; a program include's main
+        // programs (one extra read). Every other type's JSON is unchanged.
+        let extra;
+        try {
+            extra = await objectStructureExtras(String(args.type ?? ''), String(args.name ?? ''), rawXml ?? '', ctx);
+        }
+        catch (e) {
+            if (!(e instanceof UnreadableDocument))
+                throw e;
+            return { content: JSON.stringify({ error: 'read_failed', detail: e.message }), is_error: true };
+        }
+        return { content: JSON.stringify({ name, type, version, ...extra, ...rest }, null, 2) };
     },
 });
+/** A module or include document that does not parse: said in plain words, never the parser's text. */
+class UnreadableDocument extends Error {
+}
+/** Part 2c (D18) — the type-specific fields sap_object_structure adds after `version`. */
+async function objectStructureExtras(type, name, rawXml, ctx) {
+    switch (type.trim().toUpperCase().split('/')[0]) {
+        case 'FUNC': {
+            let fm;
+            try {
+                fm = parseFunctionModuleDocument(rawXml);
+            }
+            catch {
+                throw new UnreadableDocument(`SAP's answer for function module ${name.trim().toUpperCase()} could not be read as a function module document.`);
+            }
+            return { function_group: fm.group, processing_type: fm.processingType, release_state: fm.releaseState };
+        }
+        case 'FINC': {
+            try {
+                return { function_group: parseContainerDocument(rawXml).group };
+            }
+            catch {
+                throw new UnreadableDocument(`SAP's answer for function-group include ${name.trim().toUpperCase()} could not be read as an include document.`);
+            }
+        }
+        case 'INCL':
+            return { main_programs: (await ctx.adt.includeMainPrograms(name)).map((m) => m.name) };
+        default:
+            return {};
+    }
+}
 // -----------------------------------------------------------------------
 // 3. sap_search_object
 // -----------------------------------------------------------------------
@@ -569,7 +614,8 @@ registerTool({
 // -----------------------------------------------------------------------
 registerTool({
     name: 'sap_syntax_check',
-    description: 'Run a syntax check on an ABAP object and return any errors or warnings without activating it.',
+    description: 'Run a syntax check on an ABAP object and return any errors or warnings without activating it. '
+        + 'Types FUNC (function module), FINC (function-group include, e.g. L<GROUP>TOP), INCL (program include) and TTYP (table type) are supported; give the bare name — CSPeach finds the group.',
     isMutating: false,
     requiresSap: true,
     input_schema: {
@@ -850,3 +896,64 @@ registerTool({
         };
     },
 });
+// -----------------------------------------------------------------------
+// 21. sap_table_type_read (Part 2c, D18) — one table type, read only
+// -----------------------------------------------------------------------
+registerTool({
+    name: 'sap_table_type_read',
+    description: 'Read one table type (TTYP): its row type, access type and key. A table type has no source, so sap_get_source does not read it.',
+    isMutating: false,
+    requiresSap: true,
+    input_schema: {
+        type: 'object',
+        properties: {
+            name: { type: 'string', description: 'Table type name, e.g. ZCSP_ORDERS_TT' },
+        },
+        required: ['name'],
+    },
+    handler: async (args, ctx) => {
+        const name = String(args.name ?? '').trim().toUpperCase();
+        try {
+            const info = await ctx.adt.readTableType(args.name);
+            return { content: JSON.stringify(info, null, 2) };
+        }
+        catch (e) {
+            if (!isSapNotFound(e))
+                throw e;
+            return notFound(`Table type ${name} does not exist.`);
+        }
+    },
+});
+// -----------------------------------------------------------------------
+// 22. sap_function_group_list (Part 2c, D18) — a group's modules and includes
+// -----------------------------------------------------------------------
+registerTool({
+    name: 'sap_function_group_list',
+    description: 'List the function modules and includes of one function group, by name. Read each one with sap_get_source (type FUNC or FINC).',
+    isMutating: false,
+    requiresSap: true,
+    input_schema: {
+        type: 'object',
+        properties: {
+            group: { type: 'string', description: 'Function group name, e.g. ZCSP_ORDERS' },
+        },
+        required: ['group'],
+    },
+    handler: async (args, ctx) => {
+        const group = String(args.group ?? '').trim().toUpperCase();
+        let members;
+        try {
+            members = await ctx.adt.functionGroupMembers(args.group);
+        }
+        catch (e) {
+            if (!isSapNotFound(e))
+                throw e;
+            return notFound(`Function group ${group} does not exist.`);
+        }
+        const function_modules = members.functionModules.map((m) => m.name);
+        const includes = members.includes.map((m) => m.name);
+        return {
+            content: JSON.stringify({ group: members.group || group, function_modules, includes, count: function_modules.length + includes.length }),
+        };
+    },
+});

package/dist/tools/sap-write.js

@@ -32,7 +32,8 @@ import { hasRecordedSyntaxErrorsByName, clearSyntaxErrorsAfterActivation } from
 import { teamFixOffers, cspeachWritesThisSession } from '../register/offer.js';
 import { appendPending, finalizeToolCall } from '../session/pending.js';
 import { checkTransportFit, reusedRequestRefusal } from './transport-fit-check.js';
-import { auditLog, SapError } from '@cspeach/sap-client';
+import { typeCode } from '../approvals/risk-floor.js';
+import { auditLog, SapError, hasClassicParameterBlock } from '@cspeach/sap-client';
 import { ERR } from '../errors/codes.js';
 import { interceptUpdateMethod, CancelledByUserError, } from './update-method-intercept.js';
 // F-L2-1: statusline-only wire — records the transport a write ACTUALLY
@@ -41,9 +42,20 @@ import { interceptUpdateMethod, CancelledByUserError, } from './update-method-in
 import { noteWriteTransport, setCurrentTransport } from '../repl/current-transport.js';
 import { markTransportCreatedThisSession } from './transport.js';
 import { hasManualLocks, noteManualLock, noteManualUnlock } from '../sap/session-end.js';
-import { snapshotChainState, writtenWithSyntaxErrors, chainActivation, journeyWording, activatedByWrite, nextStepAfterWrite, snapshotSource, writeToolHandler, } from './write-pipeline.js';
+import { snapshotChainState, writtenWithSyntaxErrors, chainActivation, journeyWording, activatedByWrite, sweepFields, nextStepAfterWrite, snapshotSource, writeToolHandler, } from './write-pipeline.js';
+/**
+ * Part 2c D16 — sap-client's own sentence (adt-client.ts FUNC_CLASSIC_BLOCK_TEXT),
+ * said here before the approval is spent (Task 5 review I-4).
+ */
+const FUNC_CLASSIC_BLOCK_TEXT = 'A function module\'s signature goes in the FUNCTION statement (IMPORTING / EXPORTING / CHANGING / TABLES / EXCEPTIONS), '
+    + 'not in a *" comment block. Rewrite the header and try again.';
 const SET_SOURCE_SPEC = {
     tool: 'sap_set_source',
+    // Part 2c D16 (review I-4): a function module's classic *" block is refused
+    // before the approval is spent, the snapshot is read or the WAL is opened.
+    beforeApproval: (a) => (typeCode(a.type) === 'FUNC' && hasClassicParameterBlock(String(a.source ?? ''))
+        ? { error: 'classic_parameter_block', detail: FUNC_CLASSIC_BLOCK_TEXT }
+        : undefined),
     approval: {
         object: (a) => a.name,
         op: 'modify',
@@ -62,6 +74,11 @@ const SET_SOURCE_SPEC = {
     }),
     walArgs: (a) => ({ name: a.name, type: a.type }),
     call: (a, ctx, pre) => ctx.adt.setSource(a.type, a.name, a.source, pre.transport),
+    // Part 2c: a module's or include's refusal from sap-client in plain words;
+    // every other type keeps the default `{ error, detail: String(err) }`.
+    onThrow: (err, a) => (isFunctionGroupMember(a.type) && err instanceof SapError
+        ? { error: 'write_failed', detail: plainSapText(err) }
+        : undefined),
     errorCode: 'write_failed',
     landed: (r) => (r.error && !writtenWithSyntaxErrors(r)) || (r.writeStatus !== undefined && r.writeStatus >= 400)
         ? { ok: false, detail: r.error ?? `Write returned HTTP ${r.writeStatus} but did not throw`, extra: { write_status: r.writeStatus } }
@@ -101,7 +118,8 @@ registerTool({
     description: 'Overwrite the full source of an ABAP object. Requires approval_id. '
         + 'Use for class-definition changes, new methods, or any change not confined to '
         + 'a single method body. For method-body-only edits use sap_update_method (Rule 7a). '
-        + 'The transport auto-resolves to the owning request if the object is already locked.',
+        + 'The transport auto-resolves to the owning request if the object is already locked. '
+        + 'Types FUNC (function module), FINC (function-group include, e.g. L<GROUP>TOP), INCL (program include) and TTYP (table type) are supported; give the bare name — CSPeach finds the group.',
     isMutating: true,
     requiresSap: true,
     input_schema: {
@@ -231,7 +249,10 @@ const DELETE_OBJECT_SPEC = {
         rule: 'RULE_7_SNAPSHOT_BEFORE_WRITE',
         op: 'delete_object',
         object: { type: a.type, name: a.name },
-        what_will_happen: 'Deletes object from SAP; snapshot is taken first; recovery via sap_snapshot_read + sap_set_source (LLM composes the rollback).',
+        // Part 2c D20 — a group delete takes every module and include with it.
+        what_will_happen: typeCode(a.type) === 'FUGR'
+            ? 'Deletes the function group and every function module and include in it from SAP; CSPeach tries to save a copy of each member and of the main program first (a member it cannot read is not saved); recovery via sap_snapshot_read + sap_create_object/sap_set_source (LLM composes the rollback).'
+            : 'Deletes object from SAP; snapshot is taken first; recovery via sap_snapshot_read + sap_set_source (LLM composes the rollback).',
         rollback_available: true,
         transport,
         args: { ...a },
@@ -245,12 +266,15 @@ const DELETE_OBJECT_SPEC = {
         : { ok: true },
     audit: { method: 'deleteObject', type: (a) => a.type, name: (a) => a.name },
     verify: { syntax: false, activation: false, deletedCheck: true },
-    envelope: (_a, _r, pre) => {
+    envelope: (a, _r, pre) => {
         const stillExists = pre.extra['still_exists'];
         return {
             deleted: !stillExists,
             still_exists: stillExists,
             ...(pre.owning ? { transport_used: pre.owning, transport_note: pre.note } : {}),
+            // Part 2c D10 — deleting a function-group include comments out its
+            // INCLUDE line in the group's main program, which is then inactive.
+            ...(!stillExists && typeCode(a.type) === 'FINC' ? fincDeleteNextStep(a.name) : {}),
         };
     },
 };
@@ -260,7 +284,8 @@ registerTool({
     description: 'Delete an ABAP object. Requires approval_id. '
         + 'A snapshot is taken automatically before deletion. '
         + 'Post-check: confirms the object no longer exists. '
-        + 'The transport auto-resolves to the owning request if the object is already locked.',
+        + 'The transport auto-resolves to the owning request if the object is already locked. '
+        + 'Types FUNC (function module), FINC (function-group include, e.g. L<GROUP>TOP), INCL (program include) and TTYP (table type) are supported; give the bare name — CSPeach finds the group.',
     isMutating: true,
     requiresSap: true,
     input_schema: {
@@ -279,6 +304,16 @@ const isDevcCreate = (a) => String(a.type ?? '').toUpperCase().split('/')[0].tri
 const devcTransportCreated = (pre) => pre.extra['devc_transport_created'];
 const CREATE_OBJECT_SPEC = {
     tool: 'sap_create_object',
+    // Part 2c D6 (review I-4): a module or include needs its group — refused
+    // before the approval is spent. Presence only: whether the group is a
+    // customer group (D19) is sap-client's rule.
+    beforeApproval: (a) => (isFunctionGroupMember(a.type) && !String(a.functionGroup ?? '').trim()
+        ? {
+            error: 'function_group_required',
+            detail: `A ${typeCode(a.type) === 'FUNC' ? 'function module' : 'function-group include'} is created inside a function group. `
+                + 'Give functionGroup: the customer function group it belongs to (Z, Y or a registered namespace).',
+        }
+        : undefined),
     // 2026-10-04 — a plan-grant id holds the write to its claims (type, package, transport).
     approval: {
         object: (a) => a.name, op: 'create',
@@ -341,12 +376,20 @@ const CREATE_OBJECT_SPEC = {
         serviceDefinition: a.serviceDefinition,
         bindingType: a.bindingType,
         bindingVersion: a.bindingVersion,
+        // Part 2c D6 — FUNC/FINC: the group; sap-client refuses a missing or SAP group (D19).
+        ...(a.functionGroup !== undefined ? { functionGroup: a.functionGroup } : {}),
         ...(pre.extra['devc_extras'] ?? {}),
         // Review fix round 1, I-1: a sap_lock handle lives in the stateful
         // session; sap-client ends that session before a create unless told.
         keepSession: hasManualLocks(),
     }),
-    onThrow: (err, _a, pre) => ({ error: 'create_failed', detail: String(err), ...orphanRequest(devcTransportCreated(pre)) }),
+    // Part 2c: sap-client's refusal of a module or include (no group, an SAP
+    // group, a wrong include name) reads in plain words; every other type as before.
+    onThrow: (err, a, pre) => ({
+        error: 'create_failed',
+        detail: isFunctionGroupMember(a.type) && err instanceof SapError ? plainSapText(err) : String(err),
+        ...orphanRequest(devcTransportCreated(pre)),
+    }),
     errorCode: 'create_failed',
     landed: (r, pre) => r.status === 'created'
         ? { ok: true }
@@ -375,11 +418,7 @@ const CREATE_OBJECT_SPEC = {
             object: r.objectName,
             type: r.objectType,
             package: r.packageName,
-            // A message class has no source and is never activated: its messages
-            // go in through sap_message_maintain (bug 3, 2026-10-12).
-            next_step: String(r.objectType ?? '').toUpperCase() === 'MSAG'
-                ? 'add_messages_via_sap_message_maintain (a message class has no source and no activation)'
-                : 'write_source_via_sap_set_source_then_activate',
+            next_step: createNextStep(r.objectType),
         };
     },
 };
@@ -395,7 +434,8 @@ registerTool({
         + "\"Create package NAME and its transport '<text>'\" (<text> = the description argument, ≤60 ASCII chars) and the approval object is the package name. "
         + 'Optional DEVC params: description, softwareComponent (default HOME), transportLayer '
         + '(default: the system\'s layer), applicationComponent, superPackage, responsible '
-        + '(default: you, upper case). A $-local package needs no transport.',
+        + '(default: you, upper case). A $-local package needs no transport. '
+        + 'FUNC and FINC need `functionGroup` (a customer group: Z, Y or a registered namespace — never an SAP group); TTYP is created with sap_create_table_type.',
     isMutating: true,
     requiresSap: true,
     input_schema: {
@@ -412,6 +452,8 @@ registerTool({
             serviceDefinition: { type: 'string', description: 'SRVB ONLY — REQUIRED when type=SRVB: name of the activated service definition (SRVD) to bind, e.g. ZUI_MYSERVICE.' },
             bindingType: { type: 'string', description: 'SRVB ONLY (optional): binding protocol. Default ODATA.' },
             bindingVersion: { type: 'string', description: 'SRVB ONLY (optional): binding version. Default V4 (OData V4 UI). Use V2 for OData V2.' },
+            // Part 2c D6 — FUNC/FINC only.
+            functionGroup: { type: 'string', description: 'For type FUNC or FINC: the customer function group (Z, Y or a registered namespace) the module or include belongs to. Required for those two types.' },
             // DEVC-only (§10a): package attributes; ignored for other types.
             softwareComponent: { type: 'string', description: 'DEVC ONLY (optional): software component. Default HOME.' },
             transportLayer: { type: 'string', description: 'DEVC ONLY (optional): transport layer. When omitted: used if the SAP transport check names one; otherwise the create is refused and the layer must be named.' },
@@ -423,6 +465,39 @@ registerTool({
     },
     handler: writeToolHandler(CREATE_OBJECT_SPEC),
 });
+/**
+ * Part 2c D10 — after a function-group include is deleted, the group's main
+ * program is inactive. SAP names such an include L<GROUP><three characters>
+ * (after an optional /NAMESPACE/), so the group is read from the name; a name
+ * that is not of that shape names no group (none is guessed).
+ */
+function fincDeleteNextStep(name) {
+    const m = /^(\/[A-Z0-9_]+\/)?L([A-Z0-9_]+)[A-Z0-9_$]{3}$/.exec(String(name ?? '').trim().toUpperCase());
+    if (!m)
+        return { next_step: 'the group main program is now inactive: run sap_activate with type FUGR and the group name' };
+    const group = `${m[1] ?? ''}${m[2]}`;
+    return { function_group: group, next_step: `the group main program is now inactive: run sap_activate with type FUGR and name ${group}` };
+}
+/** Part 2c — a module or an include created inside a function group. */
+const isFunctionGroupMember = (type) => ['FUNC', 'FINC'].includes(typeCode(type));
+/**
+ * The next step after a create. A message class has no source and is never
+ * activated: its messages go in through sap_message_maintain (bug 3,
+ * 2026-10-12). Part 2c: a function group is active at once (probe trap 2); a
+ * module or include is activated by its write together with the group's
+ * inactive includes (D5); a program include is checked and activated only
+ * once a program includes it (D7).
+ */
+function createNextStep(objectType) {
+    switch (String(objectType ?? '').toUpperCase()) {
+        case 'MSAG': return 'add_messages_via_sap_message_maintain (a message class has no source and no activation)';
+        case 'FUGR': return 'create_modules_with_sap_create_object_FUNC (the group is active; no activation needed)';
+        case 'FUNC': return "write_source_via_sap_set_source (signature in the FUNCTION statement) — the write activates it with the group's inactive includes";
+        case 'FINC': return "write_source_via_sap_set_source — the write activates it with the group's other inactive includes";
+        case 'INCL': return 'write_source_via_sap_set_source — it is checked and activated once a program includes it; then sap_activate INCL';
+        default: return 'write_source_via_sap_set_source_then_activate';
+    }
+}
 /**
  * §10a — when the package create fails after the flow already made a request,
  * say so: the request exists, empty, and can be used on the next try.
@@ -760,7 +835,9 @@ registerTool({
     name: 'sap_activate',
     description: 'Activate one or more ABAP objects. Required after sap_set_source / '
         + 'sap_update_method / sap_create_object (Rule 10). '
-        + 'Post-check: objects must no longer appear in the inactive-objects list.',
+        + 'Post-check: objects must no longer appear in the inactive-objects list. '
+        + "A function module or function-group include is activated together with its group's inactive includes; `also_activated` lists them. "
+        + 'Type FUGR activates every inactive member of the group.',
     isMutating: true,
     requiresSap: true,
     input_schema: {
@@ -849,7 +926,14 @@ registerTool({
             try {
                 const res = await ctx.adt.activate(obj.type, obj.name);
                 await auditLog('activate', obj.type, obj.name, res.success ? 'success' : 'error', Date.now() - startedAt);
-                activationResults.push({ name: obj.name, type: obj.type, success: res.success, messages: res.messages });
+                // Part 2c D2/D5 — the function-group sweep: `also_activated` only when
+                // it succeeded; a failed one says what was SENT with the target
+                // (`sent_with`) and, when an error names no part, that it may be a
+                // member's (review I-2). Warnings are already in `messages`.
+                activationResults.push({
+                    name: obj.name, type: obj.type, success: res.success, messages: res.messages,
+                    ...sweepFields(res, obj.name, { warnings: false }),
+                });
                 if (!res.success)
                     anyError = true;
             }
@@ -1411,3 +1495,75 @@ registerTool({
     },
     handler: writeToolHandler(CREATE_BADI_IMPL_SPEC),
 });
+const CREATE_TABLE_TYPE_SPEC = {
+    tool: 'sap_create_table_type',
+    approval: {
+        object: (a) => a.name, op: 'create',
+        // Review I-3: only an id from a table-type card creates one (an id from
+        // "Create table ZX" or "Create structure ZX" never does), as for ENHO.
+        boundType: 'TTYP',
+        claims: (a, ctx) => ({ type: 'TTYP', package: a.package, transport: a.transport ?? ctx.currentTransport?.get() ?? null }),
+    },
+    transport: { mode: 'three-tier' },
+    snapshot: { kind: 'none', reason: 'a new table type has no prior document' },
+    preGate: async (a, ctx, pre) => {
+        const fit = await checkTransportFit(ctx.adt, { type: 'TTYP', name: a.name, pkg: a.package, transport: pre.transport });
+        return fit.ok ? { ok: true } : { error: fit.refusal };
+    },
+    walArgs: (a) => ({ name: a.name, type: 'TTYP', package: a.package, row_type: a.row_type }),
+    call: (a, ctx, pre) => ctx.adt.createTableType({ name: a.name, description: a.description, packageName: a.package, rowType: a.row_type }, pre.transport),
+    errorCode: 'create_failed',
+    landed: (r) => (r.status === 'created' && r.written && r.activated
+        ? { ok: true }
+        : {
+            ok: false,
+            // Activated, but the read-back is not active: sap-client's text names an
+            // address, so it is said plainly. Otherwise SAP's own words, as for a BAdI.
+            detail: r.created && r.written && r.activated
+                ? 'SAP reported the activation, but the table type does not read back as active. Check sap_inactive_objects.'
+                : r.error ?? (!r.created ? 'SAP did not create the table type'
+                    : !r.written ? 'the table type document was not written'
+                        : `activation failed: ${firstError(r.activationResult)}`),
+            extra: {
+                created: r.created, written: r.written, activated: r.activated,
+                ...(r.activationResult?.messages?.length ? { activation_messages: r.activationResult.messages.map((m) => m.shortText) } : {}),
+            },
+            audit: { status: 'error', reason: r.error ?? 'not activated' },
+        }),
+    audit: { method: 'createTableType', type: () => 'TTYP', name: (a) => a.name, detail: (a) => `row=${upperOf(a.row_type)}` },
+    verify: { syntax: false, activation: true },
+    walResult: (_a, r) => ({ created: true, activated: r.activated }),
+    chain: (a, pre, _syntax, act) => ({
+        snapshot: 'new_object', written: true, syntax: 'not_checked', activation: chainActivation(act),
+        card: { object: upperOf(a.name), what: 'table type', transport: pre.transport },
+    }),
+    envelope: (a, r, pre, _syntax, act) => ({
+        created: true, object: r.objectName, type: 'TTYP', package: r.packageName, row_type: upperOf(a.row_type),
+        ...activatedByWrite(act), ...(pre.transport ? { transport: pre.transport } : {}),
+        next_step: act?.success && act.verified
+            ? 'the table type is active: use it in signatures and DATA statements'
+            : 'activation is not confirmed: check sap_inactive_objects; a row type that is not active or does not exist stops the activation',
+    }),
+};
+registerTool({
+    name: 'sap_create_table_type',
+    requires: 'ddic.tabletypes',
+    description: 'Create and activate a standard table type whose row type is a dictionary structure. Non-unique standard key. '
+        + 'Sorted and hashed tables, data-element or table row types, built-in row types and changes to an existing table type are not supported here (ADT). '
+        + 'Requires approval_id from a request_approval change of type TTYP.',
+    isMutating: true,
+    requiresSap: true,
+    input_schema: {
+        type: 'object',
+        properties: {
+            name: { type: 'string', description: 'Name of the new table type (Z*/Y*)' },
+            description: { type: 'string', description: 'Short description' },
+            package: { type: 'string', description: 'Development package (Z*/Y* or $TMP)' },
+            row_type: { type: 'string', description: 'The active dictionary structure each row has (e.g. BAPIRET2)' },
+            transport: { type: 'string', description: 'Target transport (optional — required for workbench packages)' },
+            approval_id: { type: 'string', description: 'JWT from request_approval' },
+        },
+        required: ['name', 'description', 'package', 'row_type', 'approval_id'],
+    },
+    handler: writeToolHandler(CREATE_TABLE_TYPE_SPEC),
+});

package/dist/tools/transport-fit-check.js

@@ -27,6 +27,8 @@
 import { toObjectUrl, localPackageMessage } from '@cspeach/sap-client';
 /** At most this many fitting requests are named in a refusal. */
 export const MAX_FITTING_SHOWN = 5;
+/** Part 2c types: no transport check is sent for them (as before their rows existed). */
+const NO_FIT_CHECK_TYPES = new Set(['FUNC', 'FINC', 'INCL', 'TTYP']);
 function debug(msg) {
     if (process.env['CSPEACH_DEBUG'] !== '1')
         return;
@@ -42,6 +44,13 @@ export async function checkTransportFit(adt, o) {
         return { ok: true };
     const object = String(o.type ?? '').toUpperCase().split('/')[0].trim();
     const objectName = String(o.name ?? '').trim().toUpperCase();
+    // Part 2c fix round 1: these types had no url before their rows landed, so no
+    // check was sent. The check for them was never probed (a program include is
+    // R3TR PROG in TADIR), so they keep that behaviour.
+    if (NO_FIT_CHECK_TYPES.has(object)) {
+        debug(`no fit check for ${object} ${objectName} (not probed)`);
+        return { ok: true };
+    }
     let uri;
     try {
         uri = toObjectUrl(object, objectName).toLowerCase();

package/dist/tools/verify.js

@@ -150,6 +150,16 @@ export function inactiveBodyMentions(body, type, name) {
     catch { /* unknown type word: the name check stands */ }
     return byName || byUri;
 }
+/**
+ * Part 2c Task 5 — a program and a program include share one name space (one
+ * name is never both), so a `/programs/includes/X` entry is the same object
+ * for a caller that typed PROG, and the other way round. Before this, an
+ * inactive include checked as PROG read as "another object" and passed.
+ */
+function sameNameSpace(type) {
+    const t = type.toUpperCase();
+    return t === 'INCL' ? 'PROG' : t;
+}
 /**
  * Task 10 / D6 — is this same-named inactive-list entry provably ANOTHER
  * object? In a RAP stack the DDLS, BDEF and DDLX share one name, so a
@@ -178,7 +188,7 @@ export function isOtherObject(entry, type, name) {
     }
     if (!ours)
         return false;
-    return theirs.type.toUpperCase() !== ours.type.toUpperCase()
+    return sameNameSpace(theirs.type) !== sameNameSpace(ours.type)
         || theirs.name.toUpperCase() !== ours.name.toUpperCase();
 }
 /** The same-named entries of the parsed list, and whether any of them may be

package/dist/tools/write-pipeline.js

@@ -94,17 +94,59 @@ export function snapshotChainState(snap) {
 export function writtenWithSyntaxErrors(r) {
     return r.writeStatus !== undefined && r.writeStatus >= 200 && r.writeStatus < 300 && r.syntaxResult?.hasErrors === true;
 }
+/** Part 2c — the members SAP was sent besides `name`, as `TYPE NAME` (D2/D5). */
+export function alsoActivatedOf(members, name) {
+    const upper = String(name ?? '').trim().toUpperCase();
+    return (members ?? []).filter((m) => m.name.toUpperCase() !== upper).map((m) => `${m.type} ${m.name}`);
+}
+/**
+ * Part 2c (D2/D5; Task 5 review I-1, I-2) — what an activation that swept a
+ * function group's members says, as envelope keys. Empty when the result
+ * lists no `members` (every type but FUNC/FINC/FUGR), so those envelopes stay
+ * byte-identical.
+ *  - `warnings` (opt-in): the activation's warnings in SAP's words, e.g. a
+ *    member left out because it is inactive for another user.
+ *  - success: `also_activated` — the members activated with the target.
+ *  - failure: `sent_with` — the members sent with it, never called activated;
+ *    and `sent_with_note` when an error does not name its part, because it
+ *    may be a member's error, not the target's.
+ */
+export function sweepFields(a, name, opts) {
+    if (!a.members)
+        return {};
+    const upper = String(name ?? '').trim().toUpperCase();
+    const msgs = a.messages ?? [];
+    const others = alsoActivatedOf(a.members, upper);
+    const warnings = opts.warnings
+        ? { warnings: msgs.filter((m) => m.severity === 'warning').map((m) => m.shortText ?? '').filter(Boolean) }
+        : {};
+    if (others.length === 0)
+        return warnings;
+    if (a.success)
+        return { ...warnings, also_activated: others };
+    const unnamed = msgs.some((m) => m.severity === 'error' && !String(m.objectName ?? '').trim());
+    return {
+        ...warnings,
+        sent_with: others,
+        ...(unnamed
+            ? { sent_with_note: `These parts went to SAP together with ${upper}. An error that does not name its part may come from one of them, not from ${upper}.` }
+            : {}),
+    };
+}
 export async function verifyWriteActivation(ctx, r, name, type) {
     const a = r.activationResult;
     if (!a)
         return undefined;
     const errors = (a.messages ?? []).filter((m) => m.severity === 'error').map((m) => m.shortText ?? '').filter(Boolean).slice(0, 5);
+    // A failed activation never lists members as activated (sweepFields).
+    const sweep = a.members ? { sweep: sweepFields(a, name, { warnings: true }) } : {};
     if (!a.success)
-        return { success: false, verified: false, errors };
+        return { success: false, verified: false, errors, ...sweep };
+    const also = sweep;
     const v = await verifyActive(ctx.adt, name, type);
     if (v.verifyError !== undefined)
-        return { success: true, verified: false, errors, verifyError: v.verifyError };
-    return v.active ? { success: true, verified: true, errors } : { success: true, verified: false, errors, stillInactive: true };
+        return { success: true, verified: false, errors, verifyError: v.verifyError, ...also };
+    return v.active ? { success: true, verified: true, errors, ...also } : { success: true, verified: false, errors, stillInactive: true, ...also };
 }
 /** Round 8 item 5 + A-I1 — the change-frame state from the verified activation. */
 export function chainActivation(w) {
@@ -134,7 +176,10 @@ export function recordOwnFixAfterWrite(ctx, type, name, transport, w) {
 export function activatedByWrite(w) {
     if (!w)
         return {};
-    return { activated_by_write: { success: w.success, verified: w.verified, errors: w.errors } };
+    return { activated_by_write: {
+            success: w.success, verified: w.verified, errors: w.errors,
+            ...(w.sweep ?? {}),
+        } };
 }
 /** A-I1 minor — after a verified activation on write, say so instead of "activation_allowed". */
 export function nextStepAfterWrite(syntaxOk, w) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cspeach/cli",
-  "version": "1.1.42",
+  "version": "1.1.43",
   "description": "CSPeach — AI-assisted ABAP development CLI. Direct SAP access, signed skills, safety gates.",
   "keywords": [
     "abap",
@@ -54,7 +54,7 @@
     "@anthropic-ai/sdk": "^0.90.0",
     "@azure/msal-node": "6.0.1",
     "@cspeach/register-core": "0.4.0",
-    "@cspeach/sap-client": "0.1.27",
+    "@cspeach/sap-client": "0.1.28",
     "@iarna/toml": "^2.2.5",
     "@inkjs/ui": "^2.0.0",
     "@inquirer/prompts": "^7.0.0",